about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
author许杰友 Jieyou Xu (Joe) <39484203+jieyouxu@users.noreply.github.com>2025-03-10 18:12:34 +0800
committer许杰友 Jieyou Xu (Joe) <39484203+jieyouxu@users.noreply.github.com>2025-03-10 18:12:47 +0800
commit063ef18fdc10cb0eb49e1af855e1a8e807e73eed (patch)
treee58051c1fc9203b2eea648862340e880f2dfe5ac /src/bootstrap
parent2c6a12ec44d0426c8939123c2f2cf27d2217de13 (diff)
downloadrust-063ef18fdc10cb0eb49e1af855e1a8e807e73eed.tar.gz
rust-063ef18fdc10cb0eb49e1af855e1a8e807e73eed.zip
Revert "Use workspace lints for crates in `compiler/` #138084"
Revert <https://github.com/rust-lang/rust/pull/138084> to buy time to
consider options that avoids breaking downstream usages of cargo on
distributed `rustc-src` artifacts, where such cargo invocations fail due
to inability to inherit `lints` from workspace root manifest's
`workspace.lints` (this is only valid for the source rust-lang/rust
workspace, but not really the distributed `rustc-src` artifacts).

This breakage was reported in
<https://github.com/rust-lang/rust/issues/138304>.

This reverts commit 48caf81484b50dca5a5cebb614899a3df81ca898, reversing
changes made to c6662879b27f5161e95f39395e3c9513a7b97028.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/src/core/builder/cargo.rs13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/bootstrap/src/core/builder/cargo.rs b/src/bootstrap/src/core/builder/cargo.rs
index 2cbf82ccda3..12dd40d14e9 100644
--- a/src/bootstrap/src/core/builder/cargo.rs
+++ b/src/bootstrap/src/core/builder/cargo.rs
@@ -1072,17 +1072,12 @@ impl Builder<'_> {
         }
 
         if mode == Mode::Rustc {
-            // NOTE: rustc-specific lints are specified here. Normal rust lints
-            // are specified in the `[workspace.lints.rust]` section in the
-            // top-level `Cargo.toml`. If/when tool lints are supported by
-            // Cargo, these lints can be move to a `[workspace.lints.rustc]`
-            // section in the top-level `Cargo.toml`.
-            //
-            // NOTE: these flags are added to RUSTFLAGS, which is ignored when
-            // compiling proc macro crates such as `rustc_macros`,
-            // unfortunately.
             rustflags.arg("-Wrustc::internal");
             rustflags.arg("-Drustc::symbol_intern_string_literal");
+            // FIXME(edition_2024): Change this to `-Wrust_2024_idioms` when all
+            // of the individual lints are satisfied.
+            rustflags.arg("-Wkeyword_idents_2024");
+            rustflags.arg("-Wunsafe_op_in_unsafe_fn");
         }
 
         if self.config.rust_frame_pointers {