diff options
| author | bors <bors@rust-lang.org> | 2020-02-05 10:39:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-05 10:39:01 +0000 |
| commit | eda1a7adfcf6de70afa4ca0a6f709ed0e507516a (patch) | |
| tree | 54abe7bf227e9ee00a4b60d1d71d7ea00c2a5e36 /src/libstd | |
| parent | 4ff8fb9cb210a9f06e0eafc364bd12de2b67f087 (diff) | |
| parent | 9fa54e594b371bda6e8a2bb570e645d5aa61820b (diff) | |
| download | rust-eda1a7adfcf6de70afa4ca0a6f709ed0e507516a.tar.gz rust-eda1a7adfcf6de70afa4ca0a6f709ed0e507516a.zip | |
Auto merge of #68755 - Tyg13:update_stdarch, r=alexcrichton
Update `rust-lang/stdarch` submodule Update submodule [rust-lang/stdarch](https://github.com/rust-lang/stdarch/)
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 6 | ||||
| -rw-r--r-- | src/libstd/tests/run-time-detect.rs | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 806f868ff24..f9c9f224730 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -334,12 +334,6 @@ extern crate libc; #[allow(unused_extern_crates)] extern crate unwind; -// Only needed for now for the `std_detect` module until that crate changes to -// use `cfg_if::cfg_if!` -#[macro_use] -#[cfg(not(test))] -extern crate cfg_if; - // During testing, this crate is not actually the "real" std library, but rather // it links to the real std library, which was compiled from this same source // code. So any lang items std defines are conditionally excluded (or else they diff --git a/src/libstd/tests/run-time-detect.rs b/src/libstd/tests/run-time-detect.rs index e39cc1eed5e..2e6d1bc8efd 100644 --- a/src/libstd/tests/run-time-detect.rs +++ b/src/libstd/tests/run-time-detect.rs @@ -6,6 +6,7 @@ all(target_arch = "aarch64", any(target_os = "linux", target_os = "android")), all(target_arch = "powerpc", target_os = "linux"), all(target_arch = "powerpc64", target_os = "linux"), + any(target_arch = "x86", target_arch = "x86_64"), ), feature(stdsimd) )] |