Skip to content

Remove --cfg dox from rustdoc.rs #77347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 3, 2020
Merged

Remove --cfg dox from rustdoc.rs #77347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6533c29
Remove --cfg dox from rustdoc.rs
jyn514 Sep 29, 2020
351f850
Remove unused --cfg stageN
jyn514 Sep 29, 2020
ca98778
Update stdarch submodule
jyn514 Oct 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library/stdarch
Open in desktop
Submodule stdarch updated 10 files
+0 −3 crates/core_arch/Cargo.toml
+89 −89 crates/core_arch/avx512f.md
+2 −2 crates/core_arch/src/arm/mod.rs
+0 −6 crates/core_arch/src/core_arch_docs.md
+20 −20 crates/core_arch/src/mod.rs
+1 −1 crates/core_arch/src/wasm32/atomic.rs
+2 −2 crates/core_arch/src/wasm32/mod.rs
+3,788 −2,021 crates/core_arch/src/x86/avx512f.rs
+18 −0 crates/core_arch/src/x86/mod.rs
+475 −0 crates/core_arch/src/x86_64/avx512f.rs
7 changes: 0 additions & 7 deletions src/bootstrap/bin/rustdoc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ fn main() {
let args = env::args_os().skip(1).collect::<Vec<_>>();
let rustdoc = env::var_os("RUSTDOC_REAL").expect("RUSTDOC_REAL was not set");
let libdir = env::var_os("RUSTDOC_LIBDIR").expect("RUSTDOC_LIBDIR was not set");
let stage = env::var("RUSTC_STAGE").expect("RUSTC_STAGE was not set");
let sysroot = env::var_os("RUSTC_SYSROOT").expect("RUSTC_SYSROOT was not set");

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

//FIXME(misdreavus): once stdsimd uses cfg(doc) instead of cfg(dox), remove the `--cfg dox`
//arguments here
let mut cmd = Command::new(rustdoc);
cmd.args(&args)
.arg("--cfg")
.arg(format!("stage{}", stage))
.arg("--cfg")
.arg("dox")
.arg("--sysroot")
.arg(&sysroot)
.env(bootstrap::util::dylib_path_var(), env::join_paths(&dylib_path).unwrap());
Expand Down