From 240b0e86562231ec493e9aefede0866107813333 Mon Sep 17 00:00:00 2001
From: Vinzent Steinberg <Vinzent.Steinberg@gmail.com>
Date: Thu, 21 Feb 2019 14:40:45 +0100
Subject: [PATCH] Fix deprecation warnings for atomics initialization

Since Rust 1.34, `ATOMIC_*_INIT` is deprecated in favor of
`Atomic*::new`. However, this requires the latter to be `const`, which
is not the case for older Rust versions.

Alternatively, we could detect the Rust version by introducing build
scripts to the crates lacking them. However, this increases build time
for a very minor benefit, so the deprecation warnings are ignored
instead.

Fixes #736.
---
 rand_jitter/src/lib.rs        |  6 +++++-
 rand_os/src/netbsd.rs         |  5 ++++-
 rand_os/src/solaris.rs        | 10 ++++++++--
 src/rngs/adapter/reseeding.rs |  7 +++++--
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/rand_jitter/src/lib.rs b/rand_jitter/src/lib.rs
index ab9ae396de9..41547d8735b 100644
--- a/rand_jitter/src/lib.rs
+++ b/rand_jitter/src/lib.rs
@@ -75,7 +75,10 @@ pub use error::TimerError;
 
 use core::{fmt, mem, ptr};
 #[cfg(feature = "std")]
-use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering};
+use std::sync::atomic::{AtomicUsize, Ordering};
+#[cfg(feature = "std")]
+#[allow(deprecated)]  // Since Rust 1.34, `Atomic*::new` is preferred.
+use std::sync::atomic::ATOMIC_USIZE_INIT;
 
 const MEMORY_BLOCKS: usize = 64;
 const MEMORY_BLOCKSIZE: usize = 32;
@@ -167,6 +170,7 @@ impl Clone for JitterRng {
 
 // Initialise to zero; must be positive
 #[cfg(all(feature = "std", not(target_arch = "wasm32")))]
+#[allow(deprecated)]
 static JITTER_ROUNDS: AtomicUsize = ATOMIC_USIZE_INIT;
 
 impl JitterRng {
diff --git a/rand_os/src/netbsd.rs b/rand_os/src/netbsd.rs
index cf4b6c74f5d..c7d88022e70 100644
--- a/rand_os/src/netbsd.rs
+++ b/rand_os/src/netbsd.rs
@@ -14,7 +14,9 @@ use super::OsRngImpl;
 
 use std::fs::File;
 use std::io::Read;
-use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
+use std::sync::atomic::{AtomicBool, Ordering};
+#[allow(deprecated)]  // Since Rust 1.34, `Atomic*::new` is preferred.
+use std::sync::atomic::ATOMIC_BOOL_INIT;
 
 #[derive(Clone, Debug)]
 pub struct OsRng { initialized: bool }
@@ -34,6 +36,7 @@ impl OsRngImpl for OsRng {
     fn test_initialized(&mut self, dest: &mut [u8], _blocking: bool)
         -> Result<usize, Error>
     {
+        #[allow(deprecated)]
         static OS_RNG_INITIALIZED: AtomicBool = ATOMIC_BOOL_INIT;
         if !self.initialized {
             self.initialized = OS_RNG_INITIALIZED.load(Ordering::Relaxed);
diff --git a/rand_os/src/solaris.rs b/rand_os/src/solaris.rs
index e8965fd92cc..a3f2116b5a7 100644
--- a/rand_os/src/solaris.rs
+++ b/rand_os/src/solaris.rs
@@ -28,7 +28,9 @@ use std::io;
 use std::io::Read;
 use std::fs::{File, OpenOptions};
 use std::os::unix::fs::OpenOptionsExt;
-use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
+use std::sync::atomic::{AtomicBool, Ordering};
+#[allow(deprecated)]  // Since Rust 1.34, `Atomic*::new` is preferred.
+use std::sync::atomic::ATOMIC_BOOL_INIT;
 use std::cmp;
 
 #[derive(Clone, Debug)]
@@ -67,6 +69,7 @@ impl OsRngImpl for OsRng {
     fn test_initialized(&mut self, dest: &mut [u8], blocking: bool)
         -> Result<usize, Error>
     {
+        #[allow(deprecated)]
         static OS_RNG_INITIALIZED: AtomicBool = ATOMIC_BOOL_INIT;
         if !self.initialized {
             self.initialized = OS_RNG_INITIALIZED.load(Ordering::Relaxed);
@@ -151,10 +154,13 @@ fn getrandom_try_fill(dest: &mut [u8], blocking: bool) -> Result<(), Error> {
 }
 
 fn is_getrandom_available() -> bool {
-    use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT, Ordering};
+    use std::sync::atomic::{AtomicBool, Ordering};
+    #[allow(deprecated)]  // Since Rust 1.34, `Atomic*::new` is preferred.
+    use std::sync::atomic::ATOMIC_BOOL_INIT;
     use std::sync::{Once, ONCE_INIT};
 
     static CHECKER: Once = ONCE_INIT;
+    #[allow(deprecated)]
     static AVAILABLE: AtomicBool = ATOMIC_BOOL_INIT;
 
     CHECKER.call_once(|| {
diff --git a/src/rngs/adapter/reseeding.rs b/src/rngs/adapter/reseeding.rs
index a3e98c6d52e..a9539973cd2 100644
--- a/src/rngs/adapter/reseeding.rs
+++ b/src/rngs/adapter/reseeding.rs
@@ -286,8 +286,9 @@ where R: BlockRngCore + SeedableRng + CryptoRng,
 mod fork {
     extern crate libc;
 
-    use core::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering};
-    use core::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT};
+    use core::sync::atomic::{AtomicUsize, AtomicBool, Ordering};
+    #[allow(deprecated)]  // Since Rust 1.34, `Atomic*::new` is preferred.
+    use core::sync::atomic::{ATOMIC_USIZE_INIT, ATOMIC_BOOL_INIT};
 
     // Fork protection
     //
@@ -301,12 +302,14 @@ mod fork {
     // don't update `fork_counter`, so a reseed is attempted as soon as
     // possible.
 
+    #[allow(deprecated)]
     static RESEEDING_RNG_FORK_COUNTER: AtomicUsize = ATOMIC_USIZE_INIT;
 
     pub fn get_fork_counter() -> usize {
         RESEEDING_RNG_FORK_COUNTER.load(Ordering::Relaxed)
     }
 
+    #[allow(deprecated)]
     static FORK_HANDLER_REGISTERED: AtomicBool = ATOMIC_BOOL_INIT;
 
     extern fn fork_handler() {