Skip to content

Commit 9254b81

Browse files
authored
Rollup merge of rust-lang#84484 - jyn514:check-tools, r=Mark-Simulacrum
Don't rebuild rustdoc and clippy after checking bootstrap This works by unconditionally passing -Z unstable-options to the compiler. This has no affect in practice since bootstrap doesn't use `deny(rustc::internal)`. Fixes rust-lang#82461. r? ``@Mark-Simulacrum``
2 parents ca075d2 + 1c8e122 commit 9254b81

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

src/bootstrap/check.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,9 @@ macro_rules! tool_check_step {
321321
}
322322

323323
// Enable internal lints for clippy and rustdoc
324-
// NOTE: this intentionally doesn't enable lints for any other tools,
325-
// see https://github.com/rust-lang/rust/pull/80573#issuecomment-754010776
326-
if $path == "src/tools/rustdoc" || $path == "src/tools/clippy" {
327-
cargo.rustflag("-Zunstable-options");
328-
}
324+
// NOTE: this doesn't enable lints for any other tools unless they explicitly add `#![warn(rustc::internal)]`
325+
// See https://github.com/rust-lang/rust/pull/80573#issuecomment-754010776
326+
cargo.rustflag("-Zunstable-options");
329327

330328
builder.info(&format!(
331329
"Checking stage{} {} artifacts ({} -> {})",

src/librustdoc/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#![feature(type_ascription)]
1717
#![feature(iter_intersperse)]
1818
#![recursion_limit = "256"]
19-
#![deny(rustc::internal)]
19+
#![warn(rustc::internal)]
2020

2121
#[macro_use]
2222
extern crate lazy_static;

src/tools/clippy/clippy_lints/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// warn on lints, that are included in `rust-lang/rust`s bootstrap
1818
#![warn(rust_2018_idioms, unused_lifetimes)]
1919
// warn on rustc internal lints
20-
#![deny(rustc::internal)]
20+
#![warn(rustc::internal)]
2121

2222
// FIXME: switch to something more ergonomic here, once available.
2323
// (Currently there is no way to opt into sysroot crates without `extern crate`.)

src/tools/clippy/src/driver.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// warn on lints, that are included in `rust-lang/rust`s bootstrap
55
#![warn(rust_2018_idioms, unused_lifetimes)]
66
// warn on rustc internal lints
7-
#![deny(rustc::internal)]
7+
#![warn(rustc::internal)]
88

99
// FIXME: switch to something more ergonomic here, once available.
1010
// (Currently there is no way to opt into sysroot crates without `extern crate`.)

0 commit comments

Comments
 (0)