fix(lints): Prevent inheritance from bring exposed for published pack…

…ages
rust-lang · May 2, 2024 · 6c23346 · 6c23346
1 parent 27d3e3d
commit 6c23346
Show file tree

Hide file tree

Showing 4 changed files with 124 additions and 215 deletions.
diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs
@@ -1149,25 +1149,11 @@ impl<'gctx> Workspace<'gctx> {
     }
 
     pub fn emit_warnings(&self) -> CargoResult<()> {
-        let ws_lints = self
-            .root_maybe()
-            .workspace_config()
-            .inheritable()
-            .and_then(|i| i.lints().ok())
-            .unwrap_or_default();
-
-        let ws_cargo_lints = ws_lints
-            .get("cargo")
-            .cloned()
-            .unwrap_or_default()
-            .into_iter()
-            .collect();
-
         for (path, maybe_pkg) in &self.packages.packages {
             let path = path.join("Cargo.toml");
             if let MaybePackage::Package(pkg) = maybe_pkg {
                 if self.gctx.cli_unstable().cargo_lints {
-                    self.emit_lints(pkg, &path, &ws_cargo_lints)?
+                    self.emit_lints(pkg, &path)?
                 }
             }
             let warnings = match maybe_pkg {
@@ -1195,12 +1181,7 @@ impl<'gctx> Workspace<'gctx> {
         Ok(())
     }
 
-    pub fn emit_lints(
-        &self,
-        pkg: &Package,
-        path: &Path,
-        ws_cargo_lints: &manifest::TomlToolLints,
-    ) -> CargoResult<()> {
+    pub fn emit_lints(&self, pkg: &Package, path: &Path) -> CargoResult<()> {
         let mut error_count = 0;
         let toml_lints = pkg
             .manifest()
@@ -1214,16 +1195,6 @@ impl<'gctx> Workspace<'gctx> {
             .cloned()
             .unwrap_or(manifest::TomlToolLints::default());
 
-        // We should only be using workspace lints if the `[lints]` table is
-        // present in the manifest, and `workspace` is set to `true`
-        let ws_cargo_lints = pkg
-            .manifest()
-            .resolved_toml()
-            .lints
-            .as_ref()
-            .is_some_and(|l| l.workspace)
-            .then(|| ws_cargo_lints);
-
         let ws_contents = match self.root_maybe() {
             MaybePackage::Package(pkg) => pkg.manifest().contents(),
             MaybePackage::Virtual(v) => v.contents(),
@@ -1238,36 +1209,14 @@ impl<'gctx> Workspace<'gctx> {
             pkg,
             &path,
             &cargo_lints,
-            ws_cargo_lints,
             ws_contents,
             ws_document,
             self.root_manifest(),
             self.gctx,
         )?;
-        check_im_a_teapot(
-            pkg,
-            &path,
-            &cargo_lints,
-            ws_cargo_lints,
-            &mut error_count,
-            self.gctx,
-        )?;
-        check_implicit_features(
-            pkg,
-            &path,
-            &cargo_lints,
-            ws_cargo_lints,
-            &mut error_count,
-            self.gctx,
-        )?;
-        unused_dependencies(
-            pkg,
-            &path,
-            &cargo_lints,
-            ws_cargo_lints,
-            &mut error_count,
-            self.gctx,
-        )?;
+        check_im_a_teapot(pkg, &path, &cargo_lints, &mut error_count, self.gctx)?;
+        check_implicit_features(pkg, &path, &cargo_lints, &mut error_count, self.gctx)?;
+        unused_dependencies(pkg, &path, &cargo_lints, &mut error_count, self.gctx)?;
         if error_count > 0 {
             Err(crate::util::errors::AlreadyPrintedError::new(anyhow!(
                 "encountered {error_count} errors(s) while running lints"