diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-02 09:19:00 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-02 09:19:00 -0800 |
| commit | 009ec5d2b0c4ab0e7dc7ab2f6b15754b4da14caf (patch) | |
| tree | 8b441fd58860857f2e7bf5eabbf2226b92bf13c7 /src/libstd/rand | |
| parent | 0101bbe7acb38e8113c0cafeb7d5ae0be6448e5b (diff) | |
| parent | f3a7ec7028c76b3a1c6051131328f372b068e33a (diff) | |
rollup merge of #20315: alexcrichton/std-sync
Conflicts: src/libstd/rt/exclusive.rs src/libstd/sync/barrier.rs src/libstd/sys/unix/pipe.rs src/test/bench/shootout-binarytrees.rs src/test/bench/shootout-fannkuch-redux.rs
Diffstat (limited to 'src/libstd/rand')
| -rw-r--r-- | src/libstd/rand/os.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs index 6b60bcac9ca..9f3ac84afff 100644 --- a/src/libstd/rand/os.rs +++ b/src/libstd/rand/os.rs @@ -84,10 +84,10 @@ mod imp { #[cfg(all(target_os = "linux", any(target_arch = "x86_64", target_arch = "x86", target_arch = "arm")))] fn is_getrandom_available() -> bool { - use sync::atomic::{AtomicBool, INIT_ATOMIC_BOOL, Relaxed}; + use sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Relaxed}; - static GETRANDOM_CHECKED: AtomicBool = INIT_ATOMIC_BOOL; - static GETRANDOM_AVAILABLE: AtomicBool = INIT_ATOMIC_BOOL; + static GETRANDOM_CHECKED: AtomicBool = ATOMIC_BOOL_INIT; + static GETRANDOM_AVAILABLE: AtomicBool = ATOMIC_BOOL_INIT; if !GETRANDOM_CHECKED.load(Relaxed) { let mut buf: [u8; 0] = []; |