suppress unused_crate_deps for implicit build-std deps

Author: biscuitrescue

src/cargo/core/compiler/mod.rs

@@ -1874,68 +1874,75 @@ pub fn extern_args(
     let no_embed_metadata = build_runner.bcx.gctx.cli_unstable().no_embed_metadata;
 
     // Closure to add one dependency to `result`.
-    let mut link_to =
-        |dep: &UnitDep, extern_crate_name: InternedString, noprelude: bool| -> CargoResult<()> {
-            let mut value = OsString::new();
-            let mut opts = Vec::new();
-            let is_public_dependency_enabled = unit
-                .pkg
-                .manifest()
-                .unstable_features()
-                .require(Feature::public_dependency())
-                .is_ok()
-                || build_runner.bcx.gctx.cli_unstable().public_dependency;
-            if !dep.public && unit.target.is_lib() && is_public_dependency_enabled {
-                opts.push("priv");
-                *unstable_opts = true;
-            }
-            if noprelude {
-                opts.push("noprelude");
-                *unstable_opts = true;
-            }
-            if !opts.is_empty() {
-                value.push(opts.join(","));
-                value.push(":");
-            }
-            value.push(extern_crate_name.as_str());
-            value.push("=");
-
-            let mut pass = |file| {
-                let mut value = value.clone();
-                value.push(file);
-                result.push(OsString::from("--extern"));
-                result.push(value);
-            };
+    let mut link_to = |dep: &UnitDep,
+                       extern_crate_name: InternedString,
+                       noprelude: bool,
+                       nounused: bool|
+     -> CargoResult<()> {
+        let mut value = OsString::new();
+        let mut opts = Vec::new();
+        let is_public_dependency_enabled = unit
+            .pkg
+            .manifest()
+            .unstable_features()
+            .require(Feature::public_dependency())
+            .is_ok()
+            || build_runner.bcx.gctx.cli_unstable().public_dependency;
+        if !dep.public && unit.target.is_lib() && is_public_dependency_enabled {
+            opts.push("priv");
+            *unstable_opts = true;
+        }
+        if noprelude {
+            opts.push("noprelude");
+            *unstable_opts = true;
+        }
+        if nounused {
+            opts.push("nounused");
+            *unstable_opts = true;
+        }
+        if !opts.is_empty() {
+            value.push(opts.join(","));
+            value.push(":");
+        }
+        value.push(extern_crate_name.as_str());
+        value.push("=");
+
+        let mut pass = |file| {
+            let mut value = value.clone();
+            value.push(file);
+            result.push(OsString::from("--extern"));
+            result.push(value);
+        };
 
-            let outputs = build_runner.outputs(&dep.unit)?;
+        let outputs = build_runner.outputs(&dep.unit)?;
 
-            if build_runner.only_requires_rmeta(unit, &dep.unit) || dep.unit.mode.is_check() {
-                // Example: rlib dependency for an rlib, rmeta is all that is required.
-                let output = outputs
-                    .iter()
-                    .find(|output| output.flavor == FileFlavor::Rmeta)
-                    .expect("failed to find rmeta dep for pipelined dep");
-                pass(&output.path);
-            } else {
-                // Example: a bin needs `rlib` for dependencies, it cannot use rmeta.
-                for output in outputs.iter() {
-                    if output.flavor == FileFlavor::Linkable {
-                        pass(&output.path);
-                    }
-                    // If we use -Zembed-metadata=no, we also need to pass the path to the
-                    // corresponding .rmeta file to the linkable artifact, because the
-                    // normal dependency (rlib) doesn't contain the full metadata.
-                    else if no_embed_metadata && output.flavor == FileFlavor::Rmeta {
-                        pass(&output.path);
-                    }
+        if build_runner.only_requires_rmeta(unit, &dep.unit) || dep.unit.mode.is_check() {
+            // Example: rlib dependency for an rlib, rmeta is all that is required.
+            let output = outputs
+                .iter()
+                .find(|output| output.flavor == FileFlavor::Rmeta)
+                .expect("failed to find rmeta dep for pipelined dep");
+            pass(&output.path);
+        } else {
+            // Example: a bin needs `rlib` for dependencies, it cannot use rmeta.
+            for output in outputs.iter() {
+                if output.flavor == FileFlavor::Linkable {
+                    pass(&output.path);
+                }
+                // If we use -Zembed-metadata=no, we also need to pass the path to the
+                // corresponding .rmeta file to the linkable artifact, because the
+                // normal dependency (rlib) doesn't contain the full metadata.
+                else if no_embed_metadata && output.flavor == FileFlavor::Rmeta {
+                    pass(&output.path);
                 }
             }
-            Ok(())
-        };
+        }
+        Ok(())
+    };
 
     for dep in deps {
         if dep.unit.target.is_linkable() && !dep.unit.mode.is_doc() {
-            link_to(dep, dep.extern_crate_name, dep.noprelude)?;
+            link_to(dep, dep.extern_crate_name, dep.noprelude, dep.nounused)?;
         }
     }
     if unit.target.proc_macro() {

src/cargo/core/compiler/unit_dependencies.rs

@@ -206,6 +206,7 @@ fn attach_std_deps(
                 // TODO: Does this `public` make sense?
                 public: true,
                 noprelude: true,
+                nounused: true,
             }));
             found = true;
         }
@@ -911,6 +912,7 @@ fn new_unit_dep_with_profile(
         dep_name,
         public,
         noprelude: false,
+        nounused: false,
     })
 }
 

src/cargo/core/compiler/unit_graph.rs

@@ -40,6 +40,8 @@ pub struct UnitDep {
     pub public: bool,
     /// If `true`, the dependency should not be added to Rust's prelude.
     pub noprelude: bool,
+    /// If `true`, the dependency will not trigger Rust lint.
+    pub nounused: bool,
 }
 
 const VERSION: u32 = 1;
@@ -74,6 +76,9 @@ struct SerializedUnitDep {
     // This is only set on nightly since it is unstable.
     #[serde(skip_serializing_if = "Option::is_none")]
     noprelude: Option<bool>,
+    // This is only set on nightly since it is unstable.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    nounused: Option<bool>,
     // Intentionally not including `unit_for` because it is a low-level
     // internal detail that is mostly used for building the graph.
 }
@@ -101,16 +106,21 @@ pub fn emit_serialized_unit_graph(
                 .iter()
                 .map(|unit_dep| {
                     // https://github.com/rust-lang/rust/issues/64260 when stabilized.
-                    let (public, noprelude) = if gctx.nightly_features_allowed {
-                        (Some(unit_dep.public), Some(unit_dep.noprelude))
+                    let (public, noprelude, nounused) = if gctx.nightly_features_allowed {
+                        (
+                            Some(unit_dep.public),
+                            Some(unit_dep.noprelude),
+                            Some(unit_dep.nounused),
+                        )
                     } else {
-                        (None, None)
+                        (None, None, None)
                     };
                     SerializedUnitDep {
                         index: indices[&unit_dep.unit],
                         extern_crate_name: unit_dep.extern_crate_name,
                         public,
                         noprelude,
+                        nounused,
                     }
                 })
                 .collect();

tests/build-std/main.rs

@@ -472,15 +472,9 @@ fn build_std_does_not_warn_about_implicit_std_deps() {
         .env("RUSTFLAGS", "-W unused-crate-dependencies")
         .with_stderr_data(
             str![[r#"
-[WARNING] extern crate `alloc` is unused in crate `bar`
-[WARNING] extern crate `alloc` is unused in crate `buildstd_test`
 [WARNING] extern crate `bar` is unused in crate `buildstd_test`
-[WARNING] extern crate `compiler_builtins` is unused in crate `buildstd_test`
-[WARNING] extern crate `core` is unused in crate `buildstd_test`
-[WARNING] extern crate `proc_macro` is unused in crate `buildstd_test`
-[WARNING] `buildstd_test` (bin "buildstd_test") generated 5 warnings
+[WARNING] `buildstd_test` (bin "buildstd_test") generated 1 warning
 ...
-
 "#]]
             .unordered(),
         )

tests/testsuite/unit_graph.rs

@@ -61,6 +61,7 @@ fn simple() {
           "extern_crate_name": "b",
           "index": 1,
           "noprelude": false,
+          "nounused": false,
           "public": false
         }
       ],
@@ -106,6 +107,7 @@ fn simple() {
           "extern_crate_name": "c",
           "index": 2,
           "noprelude": false,
+          "nounused": false,
           "public": false
         }
       ],
@@ -189,6 +191,7 @@ fn simple() {
           "extern_crate_name": "a",
           "index": 0,
           "noprelude": false,
+          "nounused": false,
           "public": false
         }
       ],