about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-11 03:22:10 +0000
committerbors <bors@rust-lang.org>2018-12-11 03:22:10 +0000
commit4c0116e13ffd4b84e6691cd3b1f09269c4e76728 (patch)
tree88ca46a47465bc18f188d5bf0e22f55fd92af7a5 /src/libstd
parentda1527cb06c7245f83ca51903ea2a27631820215 (diff)
parentb4110900bd82f03b1a5a8d777fa514e78adfadef (diff)
downloadrust-4c0116e13ffd4b84e6691cd3b1f09269c4e76728.tar.gz
rust-4c0116e13ffd4b84e6691cd3b1f09269c4e76728.zip
Auto merge of #56627 - alexcrichton:update-cargo, r=alexcrichton
Update Cargo submodule and its dependencies

Hopefully just another routine update!

So far this starts to enable the `std::arch` in stage0 builds of rustc.
This means that we may need stage0/not(stage0) in stdsimd itself, but
more and more code is starting to use `std::arch` so I think it's time
to start shifting the balance of work here.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/lib.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 66771b3c4a2..90c8eaf0f7c 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -287,7 +287,7 @@
 #![feature(rustc_attrs)]
 #![feature(rustc_const_unstable)]
 #![feature(std_internals)]
-#![cfg_attr(not(stage0), feature(stdsimd))]
+#![feature(stdsimd)]
 #![feature(shrink_to)]
 #![feature(slice_concat_ext)]
 #![feature(slice_internals)]
@@ -514,18 +514,17 @@ pub mod rt;
 #[path = "../stdsimd/stdsimd/mod.rs"]
 #[allow(missing_debug_implementations, missing_docs, dead_code)]
 #[unstable(feature = "stdsimd", issue = "48556")]
-#[cfg(all(not(stage0), not(test)))]
+#[cfg(not(test))]
 mod stdsimd;
 
 // A "fake" module needed by the `stdsimd` module to compile, not actually
 // exported though.
-#[cfg(not(stage0))]
 mod coresimd {
     pub use core::arch;
 }
 
 #[stable(feature = "simd_arch", since = "1.27.0")]
-#[cfg(all(not(stage0), not(test)))]
+#[cfg(not(test))]
 pub use stdsimd::arch;
 
 // Include a number of private modules that exist solely to provide