refactor(build-std): extract support core only detection

This is a preparation of reuse for subsequent fix.

Author: weihanglo

src/cargo/core/compiler/build_context/target_info.rs

@@ -619,6 +619,16 @@ impl TargetInfo {
             .iter()
             .any(|sup| sup.as_str() == split.as_str())
     }
+
+    /// Checks if a target maybe support std.
+    ///
+    /// If no explictly stated in target spec json, we treat it as "maybe support".
+    ///
+    /// This is only useful for `-Zbuild-std` to determine the default set of
+    /// crates it is going to build.
+    pub fn maybe_support_std(&self) -> bool {
+        matches!(self.supports_std, Some(true) | None)
+    }
 }
 
 /// Takes rustc output (using specialized command line args), and calculates the file prefix and

src/cargo/core/compiler/standard_lib.rs

@@ -115,10 +115,10 @@ pub fn generate_std_roots(
 ) -> CargoResult<HashMap<CompileKind, Vec<Unit>>> {
     // Generate a map of Units for each kind requested.
     let mut ret = HashMap::new();
-    let (core_only, maybe_std): (Vec<&CompileKind>, Vec<_>) = kinds.iter().partition(|kind|
-        // Only include targets that explicitly don't support std
-        target_data.info(**kind).supports_std == Some(false));
-    for (default_crate, kinds) in [("core", core_only), ("std", maybe_std)] {
+    let (maybe_std, maybe_core): (Vec<&CompileKind>, Vec<_>) = kinds
+        .iter()
+        .partition(|kind| target_data.info(**kind).maybe_support_std());
+    for (default_crate, kinds) in [("core", maybe_core), ("std", maybe_std)] {
         if kinds.is_empty() {
             continue;
         }