From 6533c29bea5416c62c098f369553ed2b6c2c9eae Mon Sep 17 00:00:00 2001
From: Joshua Nelson <jyn514@gmail.com>
Date: Tue, 29 Sep 2020 18:00:19 -0400
Subject: [PATCH 1/3] Remove --cfg dox from rustdoc.rs
This was added in https://github.com/rust-lang/rust/pull/53076 because
several dependencies were using `cfg(dox)` instead of `cfg(rustdoc)`.
I ran `rg 'cfg\(dox\)'` on the source tree with no matches, so I think
this is now safe to remove.
---
src/bootstrap/bin/rustdoc.rs | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs
index cb58eb89ad870..95c55ffe75a6d 100644
--- a/src/bootstrap/bin/rustdoc.rs
+++ b/src/bootstrap/bin/rustdoc.rs
@@ -24,14 +24,10 @@ 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());
From 351f850d33e0a000c8fd8b43e71e03d91f470383 Mon Sep 17 00:00:00 2001
From: Joshua Nelson <jyn514@gmail.com>
Date: Tue, 29 Sep 2020 18:20:21 -0400
Subject: [PATCH 2/3] Remove unused --cfg stageN
---
src/bootstrap/bin/rustdoc.rs | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs
index 95c55ffe75a6d..cba17c8e6085b 100644
--- a/src/bootstrap/bin/rustdoc.rs
+++ b/src/bootstrap/bin/rustdoc.rs
@@ -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;
@@ -26,8 +25,6 @@ fn main() {
let mut cmd = Command::new(rustdoc);
cmd.args(&args)
- .arg("--cfg")
- .arg(format!("stage{}", stage))
.arg("--sysroot")
.arg(&sysroot)
.env(bootstrap::util::dylib_path_var(), env::join_paths(&dylib_path).unwrap());
From ca987789ea2da972dee6e84e7aa8017840553bf9 Mon Sep 17 00:00:00 2001
From: Joshua Nelson <jyn514@gmail.com>
Date: Wed, 30 Sep 2020 21:25:31 -0400
Subject: [PATCH 3/3] Update stdarch submodule
The primary purpose is to get the fixes from
https://github.com/rust-lang/stdarch/pull/920
and https://github.com/rust-lang/stdarch/pull/922.
The other changes included are
https://github.com/rust-lang/stdarch/pull/917 and
https://github.com/rust-lang/stdarch/pull/919.
---
library/stdarch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/library/stdarch b/library/stdarch
index b422b0180f7c3..3c3664355ef46 160000
--- a/library/stdarch
+++ b/library/stdarch
@@ -1 +1 @@
-Subproject commit b422b0180f7c3327375a63a3e6660e432b9ec75d
+Subproject commit 3c3664355ef46e788b53080e521d6542fbddfd84