Rustup to rustc 1.34.0-nightly (c1c3c4e95
2019-01-29)
This commit is contained in:
parent
805af227b6
commit
410d397bcd
1 changed files with 33 additions and 24 deletions
|
@ -1,55 +1,64 @@
|
||||||
From 8bce7b9601aec46ee7704027dc173257d3e43492 Mon Sep 17 00:00:00 2001
|
From 096dee5742ccd90df2e0edfe8b6bda87a63d99cf Mon Sep 17 00:00:00 2001
|
||||||
From: bjorn3 <bjorn3@users.noreply.github.com>
|
From: bjorn3 <bjorn3@users.noreply.github.com>
|
||||||
Date: Fri, 14 Dec 2018 13:09:42 +0100
|
Date: Wed, 30 Jan 2019 18:55:58 +0100
|
||||||
Subject: [PATCH] Disable stdsimd
|
Subject: [PATCH] Disable stdsimd
|
||||||
|
|
||||||
---
|
---
|
||||||
src/libcore/lib.rs | 2 ++
|
src/libcore/lib.rs | 2 ++
|
||||||
src/libstd/lib.rs | 4 +++-
|
src/libstd/lib.rs | 6 ++----
|
||||||
2 files changed, 5 insertions(+), 1 deletion(-)
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
|
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
|
||||||
index a51674f..313c173 100644
|
index 6f364eb..69f0914 100644
|
||||||
--- a/src/libcore/lib.rs
|
--- a/src/libcore/lib.rs
|
||||||
+++ b/src/libcore/lib.rs
|
+++ b/src/libcore/lib.rs
|
||||||
@@ -248,6 +248,7 @@ macro_rules! test_v256 { ($item:item) => {}; }
|
@@ -221,6 +221,7 @@ pub mod alloc;
|
||||||
macro_rules! test_v512 { ($item:item) => {}; }
|
mod tuple;
|
||||||
#[allow(unused_macros)]
|
mod unit;
|
||||||
macro_rules! vector_impl { ($([$f:ident, $($args:tt)*]),*) => { $($f!($($args)*);)* } }
|
|
||||||
+/*
|
+/*
|
||||||
#[path = "../stdsimd/coresimd/mod.rs"]
|
// Pull in the `core_arch` crate directly into libcore. The contents of
|
||||||
#[allow(missing_docs, missing_debug_implementations, dead_code, unused_imports)]
|
// `core_arch` are in a different repository: rust-lang-nursery/stdsimd.
|
||||||
#[unstable(feature = "stdsimd", issue = "48556")]
|
//
|
||||||
@@ -255,3 +256,4 @@ mod coresimd;
|
@@ -248,3 +249,4 @@ mod core_arch;
|
||||||
|
|
||||||
#[stable(feature = "simd_arch", since = "1.27.0")]
|
#[stable(feature = "simd_arch", since = "1.27.0")]
|
||||||
pub use coresimd::arch;
|
pub use core_arch::arch;
|
||||||
+*/
|
+*/
|
||||||
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
|
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
|
||||||
index 90c8eaf..95541c3 100644
|
index 244caf2..f269fda 100644
|
||||||
--- a/src/libstd/lib.rs
|
--- a/src/libstd/lib.rs
|
||||||
+++ b/src/libstd/lib.rs
|
+++ b/src/libstd/lib.rs
|
||||||
@@ -287,7 +287,7 @@
|
@@ -271,7 +271,6 @@
|
||||||
#![feature(rustc_attrs)]
|
#![feature(rustc_attrs)]
|
||||||
#![feature(rustc_const_unstable)]
|
#![feature(rustc_const_unstable)]
|
||||||
#![feature(std_internals)]
|
#![feature(std_internals)]
|
||||||
-#![feature(stdsimd)]
|
-#![feature(stdsimd)]
|
||||||
+//#![feature(stdsimd)]
|
|
||||||
#![feature(shrink_to)]
|
#![feature(shrink_to)]
|
||||||
#![feature(slice_concat_ext)]
|
#![feature(slice_concat_ext)]
|
||||||
#![feature(slice_internals)]
|
#![feature(slice_internals)]
|
||||||
@@ -503,6 +503,7 @@ mod memchr;
|
@@ -358,9 +357,6 @@ pub mod prelude;
|
||||||
|
// Public module declarations and re-exports
|
||||||
|
#[stable(feature = "rust1", since = "1.0.0")]
|
||||||
|
pub use core::any;
|
||||||
|
-#[stable(feature = "simd_arch", since = "1.27.0")]
|
||||||
|
-#[doc(no_inline)]
|
||||||
|
-pub use core::arch;
|
||||||
|
#[stable(feature = "rust1", since = "1.0.0")]
|
||||||
|
pub use core::cell;
|
||||||
|
#[stable(feature = "rust1", since = "1.0.0")]
|
||||||
|
@@ -492,6 +488,7 @@ mod memchr;
|
||||||
// compiler
|
// compiler
|
||||||
pub mod rt;
|
pub mod rt;
|
||||||
|
|
||||||
+/*
|
+/*
|
||||||
// Pull in the `stdsimd` crate directly into libstd. This is the same as
|
// Pull in the `std_detect` crate directly into libstd. The contents of
|
||||||
// libcore's arch/simd modules where the source of truth here is in a different
|
// `std_detect` are in a different repository: rust-lang-nursery/stdsimd.
|
||||||
// repository, but we pull things in here manually to get it into libstd.
|
//
|
||||||
@@ -526,6 +527,7 @@ mod coresimd {
|
@@ -508,6 +505,7 @@ mod std_detect;
|
||||||
#[stable(feature = "simd_arch", since = "1.27.0")]
|
#[unstable(feature = "stdsimd", issue = "48556")]
|
||||||
#[cfg(not(test))]
|
#[cfg(not(test))]
|
||||||
pub use stdsimd::arch;
|
pub use std_detect::detect;
|
||||||
+*/
|
+*/
|
||||||
|
|
||||||
// Include a number of private modules that exist solely to provide
|
// Include a number of private modules that exist solely to provide
|
||||||
|
|
Loading…
Reference in a new issue