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.
This commit is contained in:
Alex Crichton 2018-12-08 03:06:54 -08:00
parent 1137d29d5e
commit b4110900bd
7 changed files with 599 additions and 452 deletions

1013
Cargo.lock

File diff suppressed because it is too large Load Diff

View File

@ -251,9 +251,7 @@ macro_rules! vector_impl { ($([$f:ident, $($args:tt)*]),*) => { $($f!($($args)*)
#[path = "../stdsimd/coresimd/mod.rs"]
#[allow(missing_docs, missing_debug_implementations, dead_code, unused_imports)]
#[unstable(feature = "stdsimd", issue = "48556")]
#[cfg(not(stage0))] // allow changes to how stdsimd works in stage0
mod coresimd;
#[stable(feature = "simd_arch", since = "1.27.0")]
#[cfg(not(stage0))]
pub use coresimd::arch;

View File

@ -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

View File

@ -47,8 +47,7 @@ pub fn analyze_source_file(
}
cfg_if! {
if #[cfg(all(any(target_arch = "x86", target_arch = "x86_64"),
not(stage0)))] {
if #[cfg(all(any(target_arch = "x86", target_arch = "x86_64")))] {
fn analyze_source_file_dispatch(src: &str,
source_file_start_pos: BytePos,
lines: &mut Vec<BytePos>,

@ -1 +1 @@
Subproject commit 5e85ba14aaa20f8133863373404cb0af69eeef2c
Subproject commit 28fb20034a5bb42ea589664de2617dd1840506d3

View File

@ -50,9 +50,11 @@ features = [
]
[dependencies]
serde_json = { version = "1.0.31", features = ["raw_value"] }
rand = { version = "0.5.5", features = ["i128_support"] }
curl-sys = { version = "0.4.13", optional = true }
parking_lot = { version = "0.6", features = ['nightly'] }
rand = { version = "0.5.5", features = ["i128_support"] }
serde_json = { version = "1.0.31", features = ["raw_value"] }
smallvec = { version = "0.6", features = ['union'] }
[target.'cfg(not(windows))'.dependencies]
openssl = { version = "0.10.12", optional = true }

View File

@ -52,6 +52,7 @@ const EXCEPTIONS: &[&str] = &[
"ryu", // Apache-2.0, rls/cargo/... (b/c of serde)
"bytesize", // Apache-2.0, cargo
"im-rc", // MPL-2.0+, cargo
"adler32", // BSD-3-Clause AND Zlib, cargo dep that isn't used
];
/// Which crates to check against the whitelist?
@ -62,12 +63,14 @@ const WHITELIST_CRATES: &[CrateVersion] = &[
/// Whitelist of crates rustc is allowed to depend on. Avoid adding to the list if possible.
const WHITELIST: &[Crate] = &[
Crate("adler32"),
Crate("aho-corasick"),
Crate("arrayvec"),
Crate("atty"),
Crate("backtrace"),
Crate("backtrace-sys"),
Crate("bitflags"),
Crate("build_const"),
Crate("byteorder"),
Crate("cc"),
Crate("cfg-if"),
@ -75,6 +78,8 @@ const WHITELIST: &[Crate] = &[
Crate("chalk-macros"),
Crate("cloudabi"),
Crate("cmake"),
Crate("crc"),
Crate("crc32fast"),
Crate("crossbeam-deque"),
Crate("crossbeam-epoch"),
Crate("crossbeam-utils"),
@ -100,6 +105,8 @@ const WHITELIST: &[Crate] = &[
Crate("memmap"),
Crate("memoffset"),
Crate("miniz-sys"),
Crate("miniz_oxide"),
Crate("miniz_oxide_c_api"),
Crate("nodrop"),
Crate("num_cpus"),
Crate("owning_ref"),
@ -109,7 +116,12 @@ const WHITELIST: &[Crate] = &[
Crate("polonius-engine"),
Crate("quick-error"),
Crate("rand"),
Crate("rand_chacha"),
Crate("rand_core"),
Crate("rand_hc"),
Crate("rand_isaac"),
Crate("rand_pcg"),
Crate("rand_xorshift"),
Crate("redox_syscall"),
Crate("redox_termios"),
Crate("regex"),
@ -119,8 +131,12 @@ const WHITELIST: &[Crate] = &[
Crate("rustc-hash"),
Crate("rustc-rayon"),
Crate("rustc-rayon-core"),
Crate("rustc_version"),
Crate("scoped-tls"),
Crate("scopeguard"),
Crate("semver"),
Crate("semver-parser"),
Crate("serde"),
Crate("smallvec"),
Crate("stable_deref_trait"),
Crate("tempfile"),
@ -132,9 +148,9 @@ const WHITELIST: &[Crate] = &[
Crate("unicode-width"),
Crate("unreachable"),
Crate("utf8-ranges"),
Crate("vcpkg"),
Crate("version_check"),
Crate("void"),
Crate("vcpkg"),
Crate("winapi"),
Crate("winapi-build"),
Crate("winapi-i686-pc-windows-gnu"),