diff options
| author | Tyler Lanphear <animemachine13@gmail.com> | 2020-02-01 19:11:33 -0500 |
|---|---|---|
| committer | Tyler Lanphear <animemachine13@gmail.com> | 2020-02-01 22:04:18 -0500 |
| commit | 9fa54e594b371bda6e8a2bb570e645d5aa61820b (patch) | |
| tree | 540267b904101885c6fc059f59aa26ed06184de8 /src/libstd | |
| parent | e5b150edafc0e72cd7f5f3f67a4e8b417d515b01 (diff) | |
| download | rust-9fa54e594b371bda6e8a2bb570e645d5aa61820b.tar.gz rust-9fa54e594b371bda6e8a2bb570e645d5aa61820b.zip | |
stdarch: update submodule.
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 bc07c6b487b..2f27bfc2255 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -335,12 +335,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) )] |