Skip to content

Commit

Permalink
Remove dead code in rustdoc shim
Browse files Browse the repository at this point in the history
The `RUSTDOC_RESOURCE_SUFFIX` variable was never actually set.
  • Loading branch information
jyn514 committed Apr 24, 2022
1 parent c212fc4 commit 68ef667
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions src/bootstrap/bin/rustdoc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ fn main() {

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

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

// Needed to be able to run all rustdoc tests.
if let Some(ref x) = env::var_os("RUSTDOC_RESOURCE_SUFFIX") {
// This "unstable-options" can be removed when `--resource-suffix` is stabilized
cmd.arg("-Z").arg("unstable-options");
cmd.arg("--resource-suffix").arg(x);
}

if verbose > 1 {
eprintln!(
"rustdoc command: {:?}={:?} {:?}",
Expand Down

0 comments on commit 68ef667

Please sign in to comment.