Skip to content

Commit 0be2c30

Browse files
borsbors
committed
Auto merge of #53075 - Mark-Simulacrum:update-cargolock, r=alexcrichton
Update Cargo.lock This also includes major version bumps for the rand crate used by core, std, and alloc tests, among other crates (regex, etc.) used elsewhere. Since these are all internal there should be no user-visible changes. r? @alexcrichton
2 parents f68b7cc + 9ec5ef5 commit 0be2c30

File tree

26 files changed

+99
-49
lines changed

26 files changed

+99
-49
lines changed

‎src/Cargo.lock

+42-8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ version = "0.0.0"
1212
dependencies = [
1313
"compiler_builtins 0.0.0",
1414
"core 0.0.0",
15-
"rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
15+
"rand 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
1616
]
1717

1818
[[package]]
@@ -391,7 +391,7 @@ dependencies = [
391391
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
392392
"log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
393393
"miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
394-
"regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
394+
"regex 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
395395
"rustfix 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
396396
"serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
397397
"serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -421,7 +421,7 @@ dependencies = [
421421
name = "core"
422422
version = "0.0.0"
423423
dependencies = [
424-
"rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
424+
"rand 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
425425
]
426426

427427
[[package]]
@@ -1092,6 +1092,15 @@ dependencies = [
10921092
name = "linkchecker"
10931093
version = "0.1.0"
10941094

1095+
[[package]]
1096+
name = "lock_api"
1097+
version = "0.1.3"
1098+
source = "registry+https://github.com/rust-lang/crates.io-index"
1099+
dependencies = [
1100+
"owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
1101+
"scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
1102+
]
1103+
10951104
[[package]]
10961105
name = "log"
10971106
version = "0.3.9"
@@ -1397,6 +1406,15 @@ dependencies = [
13971406
"parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
13981407
]
13991408

1409+
[[package]]
1410+
name = "parking_lot"
1411+
version = "0.6.4"
1412+
source = "registry+https://github.com/rust-lang/crates.io-index"
1413+
dependencies = [
1414+
"lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
1415+
"parking_lot_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
1416+
]
1417+
14001418
[[package]]
14011419
name = "parking_lot_core"
14021420
version = "0.2.14"
@@ -1408,6 +1426,17 @@ dependencies = [
14081426
"winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
14091427
]
14101428

1429+
[[package]]
1430+
name = "parking_lot_core"
1431+
version = "0.3.0"
1432+
source = "registry+https://github.com/rust-lang/crates.io-index"
1433+
dependencies = [
1434+
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
1435+
"rand 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
1436+
"smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
1437+
"winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
1438+
]
1439+
14111440
[[package]]
14121441
name = "percent-encoding"
14131442
version = "1.0.1"
@@ -1821,7 +1850,7 @@ dependencies = [
18211850
"jobserver 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
18221851
"lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
18231852
"log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
1824-
"parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
1853+
"parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
18251854
"polonius-engine 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
18261855
"proc_macro 0.0.0",
18271856
"rustc-rayon 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2072,6 +2101,7 @@ version = "0.0.0"
20722101
dependencies = [
20732102
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
20742103
"log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
2104+
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
20752105
]
20762106

20772107
[[package]]
@@ -2081,7 +2111,7 @@ dependencies = [
20812111
"cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
20822112
"ena 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
20832113
"log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
2084-
"parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
2114+
"parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
20852115
"parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
20862116
"rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
20872117
"rustc-rayon 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2131,10 +2161,11 @@ name = "rustc_errors"
21312161
version = "0.0.0"
21322162
dependencies = [
21332163
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
2164+
"rustc_cratesio_shim 0.0.0",
21342165
"rustc_data_structures 0.0.0",
21352166
"serialize 0.0.0",
21362167
"syntax_pos 0.0.0",
2137-
"termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
2168+
"termcolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
21382169
"unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
21392170
]
21402171

@@ -2148,7 +2179,7 @@ version = "0.0.0"
21482179
dependencies = [
21492180
"graphviz 0.0.0",
21502181
"log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
2151-
"rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
2182+
"rand 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
21522183
"rustc 0.0.0",
21532184
"rustc_data_structures 0.0.0",
21542185
"rustc_fs_util 0.0.0",
@@ -2580,7 +2611,7 @@ dependencies = [
25802611
"panic_abort 0.0.0",
25812612
"panic_unwind 0.0.0",
25822613
"profiler_builtins 0.0.0",
2583-
"rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
2614+
"rand 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
25842615
"rustc_asan 0.0.0",
25852616
"rustc_lsan 0.0.0",
25862617
"rustc_msan 0.0.0",
@@ -3156,6 +3187,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
31563187
"checksum libgit2-sys 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6ab62b46003ba97701554631fa570d9f7e7947e2480ae3d941e555a54a2c0f05"
31573188
"checksum libssh2-sys 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "10dbc0957a27626444f5a3f523e6b97a70c3d702999bf1c7161cfbe7a25a9368"
31583189
"checksum libz-sys 1.0.20 (registry+https://github.com/rust-lang/crates.io-index)" = "f5f9aba969b3c45fe9c94bec65895868a9ceca9a600699f4054b75747a19c7c6"
3190+
"checksum lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54"
31593191
"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
31603192
"checksum log 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cba860f648db8e6f269df990180c2217f333472b4a6e901e97446858487971e2"
31613193
"checksum log_settings 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19af41f0565d7c19b2058153ad0b42d4d5ce89ec4dbf06ed6741114a8b63e7cd"
@@ -3188,7 +3220,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
31883220
"checksum ordslice 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dd20eec3dbe4376829cb7d80ae6ac45e0a766831dca50202ff2d40db46a8a024"
31893221
"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
31903222
"checksum parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4d05f1349491390b1730afba60bb20d55761bef489a954546b58b4b34e1e2ac"
3223+
"checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5"
31913224
"checksum parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa"
3225+
"checksum parking_lot_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06a2b6aae052309c2fd2161ef58f5067bc17bb758377a0de9d4b279d603fdd8a"
31923226
"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
31933227
"checksum pest 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0fce5d8b5cc33983fc74f78ad552b5522ab41442c4ca91606e4236eb4b5ceefc"
31943228
"checksum pest_derive 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ab94faafeb93f4c5e3ce81ca0e5a779529a602ad5d09ae6d21996bfb8b6a52bf"

‎src/liballoc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ core = { path = "../libcore" }
1414
compiler_builtins = { path = "../rustc/compiler_builtins_shim" }
1515

1616
[dev-dependencies]
17-
rand = "0.4"
17+
rand = "0.5"
1818

1919
[[test]]
2020
name = "collectionstests"

‎src/liballoc/collections/linked_list.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1222,7 +1222,7 @@ mod tests {
12221222
use std::thread;
12231223
use std::vec::Vec;
12241224

1225-
use rand::{thread_rng, Rng};
1225+
use rand::{thread_rng, RngCore};
12261226

12271227
use super::{LinkedList, Node};
12281228

‎src/liballoc/tests/slice.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ use std::sync::atomic::Ordering::Relaxed;
1818
use std::sync::atomic::{ATOMIC_USIZE_INIT, AtomicUsize};
1919
use std::thread;
2020

21-
use rand::{Rng, thread_rng};
21+
use rand::{Rng, RngCore, thread_rng};
22+
use rand::distributions::Standard;
2223

2324
fn square(n: usize) -> usize {
2425
n * n
@@ -405,7 +406,7 @@ fn test_sort() {
405406
for len in (2..25).chain(500..510) {
406407
for &modulus in &[5, 10, 100, 1000] {
407408
for _ in 0..10 {
408-
let orig: Vec<_> = rng.gen_iter::<i32>()
409+
let orig: Vec<_> = rng.sample_iter::<i32, _>(&Standard)
409410
.map(|x| x % modulus)
410411
.take(len)
411412
.collect();

‎src/libcore/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ name = "corebenches"
2020
path = "../libcore/benches/lib.rs"
2121

2222
[dev-dependencies]
23-
rand = "0.4"
23+
rand = "0.5"

‎src/libcore/tests/num/flt2dec/random.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ use core::num::flt2dec::strategy::grisu::format_exact_opt;
1818
use core::num::flt2dec::strategy::grisu::format_shortest_opt;
1919
use core::num::flt2dec::{decode, DecodableFloat, FullDecoded, Decoded};
2020

21-
use rand::{self, Rand, XorShiftRng};
22-
use rand::distributions::{IndependentSample, Range};
21+
use rand::{FromEntropy, XorShiftRng};
22+
use rand::distributions::{Distribution, Uniform};
2323

2424
pub fn decode_finite<T: DecodableFloat>(v: T) -> Decoded {
2525
match decode(v).1 {
@@ -71,21 +71,21 @@ fn iterate<F, G, V>(func: &str, k: usize, n: usize, mut f: F, mut g: G, mut v: V
7171
pub fn f32_random_equivalence_test<F, G>(f: F, g: G, k: usize, n: usize)
7272
where F: FnMut(&Decoded, &mut [u8]) -> Option<(usize, i16)>,
7373
G: FnMut(&Decoded, &mut [u8]) -> (usize, i16) {
74-
let mut rng: XorShiftRng = Rand::rand(&mut rand::thread_rng());
75-
let f32_range = Range::new(0x0000_0001u32, 0x7f80_0000);
74+
let mut rng = XorShiftRng::from_entropy();
75+
let f32_range = Uniform::new(0x0000_0001u32, 0x7f80_0000);
7676
iterate("f32_random_equivalence_test", k, n, f, g, |_| {
77-
let x = f32::from_bits(f32_range.ind_sample(&mut rng));
77+
let x = f32::from_bits(f32_range.sample(&mut rng));
7878
decode_finite(x)
7979
});
8080
}
8181

8282
pub fn f64_random_equivalence_test<F, G>(f: F, g: G, k: usize, n: usize)
8383
where F: FnMut(&Decoded, &mut [u8]) -> Option<(usize, i16)>,
8484
G: FnMut(&Decoded, &mut [u8]) -> (usize, i16) {
85-
let mut rng: XorShiftRng = Rand::rand(&mut rand::thread_rng());
86-
let f64_range = Range::new(0x0000_0000_0000_0001u64, 0x7ff0_0000_0000_0000);
85+
let mut rng = XorShiftRng::from_entropy();
86+
let f64_range = Uniform::new(0x0000_0000_0000_0001u64, 0x7ff0_0000_0000_0000);
8787
iterate("f64_random_equivalence_test", k, n, f, g, |_| {
88-
let x = f64::from_bits(f64_range.ind_sample(&mut rng));
88+
let x = f64::from_bits(f64_range.sample(&mut rng));
8989
decode_finite(x)
9090
});
9191
}

‎src/libcore/tests/slice.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -802,11 +802,11 @@ fn test_rotate_right() {
802802
fn sort_unstable() {
803803
use core::cmp::Ordering::{Equal, Greater, Less};
804804
use core::slice::heapsort;
805-
use rand::{Rng, XorShiftRng};
805+
use rand::{FromEntropy, Rng, XorShiftRng};
806806

807807
let mut v = [0; 600];
808808
let mut tmp = [0; 600];
809-
let mut rng = XorShiftRng::new_unseeded();
809+
let mut rng = XorShiftRng::from_entropy();
810810

811811
for len in (2..25).chain(500..510) {
812812
let v = &mut v[0..len];

‎src/librustc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ serialize = { path = "../libserialize" }
2929
syntax = { path = "../libsyntax" }
3030
syntax_pos = { path = "../libsyntax_pos" }
3131
backtrace = "0.3.3"
32-
parking_lot = "0.5.5"
32+
parking_lot = "0.6"
3333
byteorder = { version = "1.1", features = ["i128"]}
3434
chalk-engine = { version = "0.7.0", default-features=false }
3535
rustc_fs_util = { path = "../librustc_fs_util" }

‎src/librustc/mir/cache.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
use rustc_data_structures::indexed_vec::IndexVec;
12-
use rustc_data_structures::sync::{RwLock, ReadGuard};
12+
use rustc_data_structures::sync::{RwLock, MappedReadGuard, ReadGuard};
1313
use rustc_data_structures::stable_hasher::{HashStable, StableHasher,
1414
StableHasherResult};
1515
use ich::StableHashingContext;
@@ -55,7 +55,10 @@ impl Cache {
5555
*self.predecessors.borrow_mut() = None;
5656
}
5757

58-
pub fn predecessors(&self, mir: &Mir) -> ReadGuard<IndexVec<BasicBlock, Vec<BasicBlock>>> {
58+
pub fn predecessors(
59+
&self,
60+
mir: &Mir
61+
) -> MappedReadGuard<IndexVec<BasicBlock, Vec<BasicBlock>>> {
5962
if self.predecessors.borrow().is_none() {
6063
*self.predecessors.borrow_mut() = Some(calculate_predecessors(mir));
6164
}

‎src/librustc/mir/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use rustc_data_structures::graph::dominators::{dominators, Dominators};
2525
use rustc_data_structures::graph::{self, GraphPredecessors, GraphSuccessors};
2626
use rustc_data_structures::indexed_vec::{Idx, IndexVec};
2727
use rustc_data_structures::sync::Lrc;
28-
use rustc_data_structures::sync::ReadGuard;
28+
use rustc_data_structures::sync::MappedReadGuard;
2929
use rustc_serialize as serialize;
3030
use smallvec::SmallVec;
3131
use std::borrow::Cow;
@@ -194,13 +194,13 @@ impl<'tcx> Mir<'tcx> {
194194
}
195195

196196
#[inline]
197-
pub fn predecessors(&self) -> ReadGuard<'_, IndexVec<BasicBlock, Vec<BasicBlock>>> {
197+
pub fn predecessors(&self) -> MappedReadGuard<'_, IndexVec<BasicBlock, Vec<BasicBlock>>> {
198198
self.cache.predecessors(self)
199199
}
200200

201201
#[inline]
202-
pub fn predecessors_for(&self, bb: BasicBlock) -> ReadGuard<'_, Vec<BasicBlock>> {
203-
ReadGuard::map(self.predecessors(), |p| &p[bb])
202+
pub fn predecessors_for(&self, bb: BasicBlock) -> MappedReadGuard<'_, Vec<BasicBlock>> {
203+
MappedReadGuard::map(self.predecessors(), |p| &p[bb])
204204
}
205205

206206
#[inline]

‎src/librustc/ty/steal.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use rustc_data_structures::sync::{RwLock, ReadGuard};
11+
use rustc_data_structures::sync::{RwLock, ReadGuard, MappedReadGuard};
1212
use std::mem;
1313

1414
/// The `Steal` struct is intended to used as the value for a query.
@@ -42,7 +42,7 @@ impl<T> Steal<T> {
4242
}
4343
}
4444

45-
pub fn borrow(&self) -> ReadGuard<T> {
45+
pub fn borrow(&self) -> MappedReadGuard<T> {
4646
ReadGuard::map(self.value.borrow(), |opt| match *opt {
4747
None => bug!("attempted to read from stolen value"),
4848
Some(ref v) => v

‎src/librustc_cratesio_shim/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ crate-type = ["dylib"]
2222
[dependencies]
2323
bitflags = "1.0"
2424
log = "0.4"
25+
unicode-width = "0.1.4"

‎src/librustc_cratesio_shim/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@
1616

1717
extern crate bitflags;
1818
extern crate log;
19+
extern crate unicode_width;

‎src/librustc_data_structures/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ rustc-hash = "1.0.1"
2222
smallvec = { version = "0.6.5", features = ["union"] }
2323

2424
[dependencies.parking_lot]
25-
version = "0.5"
25+
version = "0.6"
2626
features = ["nightly"]

‎src/librustc_data_structures/sync.rs

+6
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,11 @@ cfg_if! {
9393
pub use std::rc::Rc as Lrc;
9494
pub use std::rc::Weak as Weak;
9595
pub use std::cell::Ref as ReadGuard;
96+
pub use std::cell::Ref as MappedReadGuard;
9697
pub use std::cell::RefMut as WriteGuard;
98+
pub use std::cell::RefMut as MappedWriteGuard;
9799
pub use std::cell::RefMut as LockGuard;
100+
pub use std::cell::RefMut as MappedLockGuard;
98101

99102
use std::cell::RefCell as InnerRwLock;
100103
use std::cell::RefCell as InnerLock;
@@ -213,9 +216,12 @@ cfg_if! {
213216
pub use std::marker::Sync as Sync;
214217

215218
pub use parking_lot::RwLockReadGuard as ReadGuard;
219+
pub use parking_lot::MappedRwLockReadGuard as MappedReadGuard;
216220
pub use parking_lot::RwLockWriteGuard as WriteGuard;
221+
pub use parking_lot::MappedRwLockWriteGuard as MappedWriteGuard;
217222

218223
pub use parking_lot::MutexGuard as LockGuard;
224+
pub use parking_lot::MappedMutexGuard as MappedLockGuard;
219225

220226
pub use std::sync::Arc as Lrc;
221227
pub use std::sync::Weak as Weak;

‎src/librustc_errors/Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ crate-type = ["dylib"]
1212
serialize = { path = "../libserialize" }
1313
syntax_pos = { path = "../libsyntax_pos" }
1414
rustc_data_structures = { path = "../librustc_data_structures" }
15+
rustc_cratesio_shim = { path = "../librustc_cratesio_shim" }
1516
unicode-width = "0.1.4"
1617
atty = "0.2"
17-
termcolor = "0.3"
18+
termcolor = "1.0"

‎src/librustc_incremental/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ crate-type = ["dylib"]
1111
[dependencies]
1212
graphviz = { path = "../libgraphviz" }
1313
log = "0.4"
14-
rand = "0.4"
14+
rand = "0.5"
1515
rustc = { path = "../librustc" }
1616
rustc_data_structures = { path = "../librustc_data_structures" }
1717
serialize = { path = "../libserialize" }

‎src/librustc_incremental/persist/fs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ use std::mem;
126126
use std::path::{Path, PathBuf};
127127
use std::time::{UNIX_EPOCH, SystemTime, Duration};
128128

129-
use rand::{thread_rng, Rng};
129+
use rand::{RngCore, thread_rng};
130130

131131
const LOCK_FILE_EXT: &'static str = ".lock";
132132
const DEP_GRAPH_FILENAME: &'static str = "dep-graph.bin";

‎src/libstd/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ profiler_builtins = { path = "../libprofiler_builtins", optional = true }
2525
unwind = { path = "../libunwind" }
2626

2727
[dev-dependencies]
28-
rand = "0.4"
28+
rand = "0.5"
2929

3030
[target.x86_64-apple-darwin.dependencies]
3131
rustc_asan = { path = "../librustc_asan" }

0 commit comments

Comments
 (0)