Skip to content

Commit 6f56fbd

Browse files
committed
Auto merge of #77347 - jyn514:dox, r=Amanieu
Remove --cfg dox from rustdoc.rs This was added in #53076 because several dependencies were using `cfg(dox)` instead of `cfg(rustdoc)` (now `cfg(doc)`). I ran `rg 'cfg\(dox\)'` on the source tree with no matches, so I think this is now safe to remove. r? `@Mark-Simulacrum` cc `@QuietMisdreavus` :)
2 parents 8c54cf6 + ca98778 commit 6f56fbd

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

Diff for: src/bootstrap/bin/rustdoc.rs

-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ fn main() {
1111
let args = env::args_os().skip(1).collect::<Vec<_>>();
1212
let rustdoc = env::var_os("RUSTDOC_REAL").expect("RUSTDOC_REAL was not set");
1313
let libdir = env::var_os("RUSTDOC_LIBDIR").expect("RUSTDOC_LIBDIR was not set");
14-
let stage = env::var("RUSTC_STAGE").expect("RUSTC_STAGE was not set");
1514
let sysroot = env::var_os("RUSTC_SYSROOT").expect("RUSTC_SYSROOT was not set");
1615

1716
use std::str::FromStr;
@@ -24,14 +23,8 @@ fn main() {
2423
let mut dylib_path = bootstrap::util::dylib_path();
2524
dylib_path.insert(0, PathBuf::from(libdir.clone()));
2625

27-
//FIXME(misdreavus): once stdsimd uses cfg(doc) instead of cfg(dox), remove the `--cfg dox`
28-
//arguments here
2926
let mut cmd = Command::new(rustdoc);
3027
cmd.args(&args)
31-
.arg("--cfg")
32-
.arg(format!("stage{}", stage))
33-
.arg("--cfg")
34-
.arg("dox")
3528
.arg("--sysroot")
3629
.arg(&sysroot)
3730
.env(bootstrap::util::dylib_path_var(), env::join_paths(&dylib_path).unwrap());

0 commit comments

Comments
 (0)