Skip to content

Commit b411090

Browse files
committedDec 10, 2018
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.

File tree

7 files changed

+598
-451
lines changed

7 files changed

+598
-451
lines changed
 

‎Cargo.lock

+572-439
Large diffs are not rendered by default.

‎src/libcore/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,7 @@ macro_rules! vector_impl { ($([$f:ident, $($args:tt)*]),*) => { $($f!($($args)*)
251251
#[path = "../stdsimd/coresimd/mod.rs"]
252252
#[allow(missing_docs, missing_debug_implementations, dead_code, unused_imports)]
253253
#[unstable(feature = "stdsimd", issue = "48556")]
254-
#[cfg(not(stage0))] // allow changes to how stdsimd works in stage0
255254
mod coresimd;
256255

257256
#[stable(feature = "simd_arch", since = "1.27.0")]
258-
#[cfg(not(stage0))]
259257
pub use coresimd::arch;

‎src/libstd/lib.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287
#![feature(rustc_attrs)]
288288
#![feature(rustc_const_unstable)]
289289
#![feature(std_internals)]
290-
#![cfg_attr(not(stage0), feature(stdsimd))]
290+
#![feature(stdsimd)]
291291
#![feature(shrink_to)]
292292
#![feature(slice_concat_ext)]
293293
#![feature(slice_internals)]
@@ -514,18 +514,17 @@ pub mod rt;
514514
#[path = "../stdsimd/stdsimd/mod.rs"]
515515
#[allow(missing_debug_implementations, missing_docs, dead_code)]
516516
#[unstable(feature = "stdsimd", issue = "48556")]
517-
#[cfg(all(not(stage0), not(test)))]
517+
#[cfg(not(test))]
518518
mod stdsimd;
519519

520520
// A "fake" module needed by the `stdsimd` module to compile, not actually
521521
// exported though.
522-
#[cfg(not(stage0))]
523522
mod coresimd {
524523
pub use core::arch;
525524
}
526525

527526
#[stable(feature = "simd_arch", since = "1.27.0")]
528-
#[cfg(all(not(stage0), not(test)))]
527+
#[cfg(not(test))]
529528
pub use stdsimd::arch;
530529

531530
// Include a number of private modules that exist solely to provide

‎src/libsyntax_pos/analyze_source_file.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ pub fn analyze_source_file(
4747
}
4848

4949
cfg_if! {
50-
if #[cfg(all(any(target_arch = "x86", target_arch = "x86_64"),
51-
not(stage0)))] {
50+
if #[cfg(all(any(target_arch = "x86", target_arch = "x86_64")))] {
5251
fn analyze_source_file_dispatch(src: &str,
5352
source_file_start_pos: BytePos,
5453
lines: &mut Vec<BytePos>,

‎src/tools/cargo

Submodule cargo updated 218 files

‎src/tools/rustc-workspace-hack/Cargo.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,11 @@ features = [
5050
]
5151

5252
[dependencies]
53-
serde_json = { version = "1.0.31", features = ["raw_value"] }
54-
rand = { version = "0.5.5", features = ["i128_support"] }
5553
curl-sys = { version = "0.4.13", optional = true }
54+
parking_lot = { version = "0.6", features = ['nightly'] }
55+
rand = { version = "0.5.5", features = ["i128_support"] }
56+
serde_json = { version = "1.0.31", features = ["raw_value"] }
57+
smallvec = { version = "0.6", features = ['union'] }
5658

5759
[target.'cfg(not(windows))'.dependencies]
5860
openssl = { version = "0.10.12", optional = true }

‎src/tools/tidy/src/deps.rs

+17-1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ const EXCEPTIONS: &[&str] = &[
5252
"ryu", // Apache-2.0, rls/cargo/... (b/c of serde)
5353
"bytesize", // Apache-2.0, cargo
5454
"im-rc", // MPL-2.0+, cargo
55+
"adler32", // BSD-3-Clause AND Zlib, cargo dep that isn't used
5556
];
5657

5758
/// Which crates to check against the whitelist?
@@ -62,19 +63,23 @@ const WHITELIST_CRATES: &[CrateVersion] = &[
6263

6364
/// Whitelist of crates rustc is allowed to depend on. Avoid adding to the list if possible.
6465
const WHITELIST: &[Crate] = &[
66+
Crate("adler32"),
6567
Crate("aho-corasick"),
6668
Crate("arrayvec"),
6769
Crate("atty"),
6870
Crate("backtrace"),
6971
Crate("backtrace-sys"),
7072
Crate("bitflags"),
73+
Crate("build_const"),
7174
Crate("byteorder"),
7275
Crate("cc"),
7376
Crate("cfg-if"),
7477
Crate("chalk-engine"),
7578
Crate("chalk-macros"),
7679
Crate("cloudabi"),
7780
Crate("cmake"),
81+
Crate("crc"),
82+
Crate("crc32fast"),
7883
Crate("crossbeam-deque"),
7984
Crate("crossbeam-epoch"),
8085
Crate("crossbeam-utils"),
@@ -100,6 +105,8 @@ const WHITELIST: &[Crate] = &[
100105
Crate("memmap"),
101106
Crate("memoffset"),
102107
Crate("miniz-sys"),
108+
Crate("miniz_oxide"),
109+
Crate("miniz_oxide_c_api"),
103110
Crate("nodrop"),
104111
Crate("num_cpus"),
105112
Crate("owning_ref"),
@@ -109,7 +116,12 @@ const WHITELIST: &[Crate] = &[
109116
Crate("polonius-engine"),
110117
Crate("quick-error"),
111118
Crate("rand"),
119+
Crate("rand_chacha"),
112120
Crate("rand_core"),
121+
Crate("rand_hc"),
122+
Crate("rand_isaac"),
123+
Crate("rand_pcg"),
124+
Crate("rand_xorshift"),
113125
Crate("redox_syscall"),
114126
Crate("redox_termios"),
115127
Crate("regex"),
@@ -119,8 +131,12 @@ const WHITELIST: &[Crate] = &[
119131
Crate("rustc-hash"),
120132
Crate("rustc-rayon"),
121133
Crate("rustc-rayon-core"),
134+
Crate("rustc_version"),
122135
Crate("scoped-tls"),
123136
Crate("scopeguard"),
137+
Crate("semver"),
138+
Crate("semver-parser"),
139+
Crate("serde"),
124140
Crate("smallvec"),
125141
Crate("stable_deref_trait"),
126142
Crate("tempfile"),
@@ -132,9 +148,9 @@ const WHITELIST: &[Crate] = &[
132148
Crate("unicode-width"),
133149
Crate("unreachable"),
134150
Crate("utf8-ranges"),
151+
Crate("vcpkg"),
135152
Crate("version_check"),
136153
Crate("void"),
137-
Crate("vcpkg"),
138154
Crate("winapi"),
139155
Crate("winapi-build"),
140156
Crate("winapi-i686-pc-windows-gnu"),

0 commit comments

Comments
 (0)
Please sign in to comment.