Skip to content

Commit f5837f8

Browse files
authored
Rollup merge of rust-lang#96366 - jyn514:remove-dead-code, r=Mark-Simulacrum
bootstrap: Remove dead code in rustdoc shim The `RUSTDOC_RESOURCE_SUFFIX` variable was never actually set.
2 parents 433f1f4 + 68ef667 commit f5837f8

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

src/bootstrap/bin/rustdoc.rs

+2-9
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ fn main() {
3131

3232
let mut cmd = Command::new(rustdoc);
3333

34-
// I am not actually sure why it's necessary to pass the sysroot for `--test`,
35-
// but `test --doc --stage 0` is broken without it :(
34+
// cfg(bootstrap)
35+
// NOTE: the `--test` special-casing can be removed when https://github.com/rust-lang/cargo/pull/10594 lands on beta.
3636
if target.is_some() || args.iter().any(|x| x == "--test") {
3737
// The stage0 compiler has a special sysroot distinct from what we
3838
// actually downloaded, so we just always pass the `--sysroot` option,
@@ -65,13 +65,6 @@ fn main() {
6565
}
6666
}
6767

68-
// Needed to be able to run all rustdoc tests.
69-
if let Some(ref x) = env::var_os("RUSTDOC_RESOURCE_SUFFIX") {
70-
// This "unstable-options" can be removed when `--resource-suffix` is stabilized
71-
cmd.arg("-Z").arg("unstable-options");
72-
cmd.arg("--resource-suffix").arg(x);
73-
}
74-
7568
if verbose > 1 {
7669
eprintln!(
7770
"rustdoc command: {:?}={:?} {:?}",

0 commit comments

Comments
 (0)