diff options
| author | bors <bors@rust-lang.org> | 2019-01-27 18:18:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-27 18:18:17 +0000 |
| commit | 8611577360e66f90470bd40c498cf8d194f67926 (patch) | |
| tree | bdbfc4b5805e1c9943247c6e846fa9ff0fb83787 /src/liballoc | |
| parent | 71c365c38085c3c6e82bc6bcad823d9926dd3942 (diff) | |
| parent | cd39cf748e3a5ab7cc4449ba9acfddb969c79209 (diff) | |
| download | rust-8611577360e66f90470bd40c498cf8d194f67926.tar.gz rust-8611577360e66f90470bd40c498cf8d194f67926.zip | |
Auto merge of #57765 - Mark-Simulacrum:bootstrap-bump, r=alexcrichton
Bump bootstrap compiler to 1.33 beta r? @alexcrichton or @pietroalbini cc @rust-lang/release
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/benches/vec_deque_append.rs | 1 | ||||
| -rw-r--r-- | src/liballoc/tests/binary_heap.rs | 4 | ||||
| -rw-r--r-- | src/liballoc/tests/slice.rs | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/liballoc/benches/vec_deque_append.rs b/src/liballoc/benches/vec_deque_append.rs index 2db8fbe1309..78ec91d9e3e 100644 --- a/src/liballoc/benches/vec_deque_append.rs +++ b/src/liballoc/benches/vec_deque_append.rs @@ -1,4 +1,3 @@ -#![cfg_attr(stage0, feature(duration_as_u128))] use std::{collections::VecDeque, time::Instant}; const VECDEQUE_LEN: i32 = 100000; diff --git a/src/liballoc/tests/binary_heap.rs b/src/liballoc/tests/binary_heap.rs index 6af1cf40809..94ae43237d1 100644 --- a/src/liballoc/tests/binary_heap.rs +++ b/src/liballoc/tests/binary_heap.rs @@ -2,7 +2,7 @@ use std::cmp; use std::collections::BinaryHeap; use std::collections::binary_heap::{Drain, PeekMut}; use std::panic::{self, AssertUnwindSafe}; -use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering}; +use std::sync::atomic::{AtomicUsize, Ordering}; use rand::{thread_rng, seq::SliceRandom}; @@ -283,7 +283,7 @@ fn assert_covariance() { // Destructors must be called exactly once per element. #[test] fn panic_safe() { - static DROP_COUNTER: AtomicUsize = ATOMIC_USIZE_INIT; + static DROP_COUNTER: AtomicUsize = AtomicUsize::new(0); #[derive(Eq, PartialEq, Ord, Clone, Debug)] struct PanicOrd<T>(T, bool); diff --git a/src/liballoc/tests/slice.rs b/src/liballoc/tests/slice.rs index 8ecd17236c0..0300bd7f3f6 100644 --- a/src/liballoc/tests/slice.rs +++ b/src/liballoc/tests/slice.rs @@ -5,7 +5,7 @@ use std::mem; use std::panic; use std::rc::Rc; use std::sync::atomic::Ordering::Relaxed; -use std::sync::atomic::{ATOMIC_USIZE_INIT, AtomicUsize}; +use std::sync::atomic::AtomicUsize; use std::thread; use rand::{Rng, RngCore, thread_rng, seq::SliceRandom}; @@ -1500,7 +1500,7 @@ static DROP_COUNTS: [AtomicUsize; MAX_LEN] = [ AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), AtomicUsize::new(0), ]; -static VERSIONS: AtomicUsize = ATOMIC_USIZE_INIT; +static VERSIONS: AtomicUsize = AtomicUsize::new(0); #[derive(Clone, Eq)] struct DropCounter { |
