From f7519f36e67b6a9547670d6635a754465ad3c09f Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 28 Jan 2019 09:19:56 +0100 Subject: [PATCH 1/2] fix tests to avoid deprecated constants --- tests/run-pass/atomic-access-bool.rs | 5 ++--- tests/run-pass/atomic-compare_exchange.rs | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/run-pass/atomic-access-bool.rs b/tests/run-pass/atomic-access-bool.rs index ada584705401..8a3db796a087 100644 --- a/tests/run-pass/atomic-access-bool.rs +++ b/tests/run-pass/atomic-access-bool.rs @@ -8,10 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT}; -use std::sync::atomic::Ordering::*; +use std::sync::atomic::{AtomicBool, Ordering::*}; -static mut ATOMIC: AtomicBool = ATOMIC_BOOL_INIT; +static mut ATOMIC: AtomicBool = AtomicBool::new(false); fn main() { unsafe { diff --git a/tests/run-pass/atomic-compare_exchange.rs b/tests/run-pass/atomic-compare_exchange.rs index ec8e16d33e42..67280096073d 100644 --- a/tests/run-pass/atomic-compare_exchange.rs +++ b/tests/run-pass/atomic-compare_exchange.rs @@ -8,10 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::sync::atomic::{AtomicIsize, ATOMIC_ISIZE_INIT}; -use std::sync::atomic::Ordering::*; +use std::sync::atomic::{AtomicIsize, Ordering::*}; -static ATOMIC: AtomicIsize = ATOMIC_ISIZE_INIT; +static ATOMIC: AtomicIsize = AtomicIsize::new(0); fn main() { // Make sure trans can emit all the intrinsics correctly From ce8cf6425e85b58840686cd1556f4ea537fc2bca Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 28 Jan 2019 09:20:06 +0100 Subject: [PATCH 2/2] bump Rust --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index a34ac2b25216..452bb5c2b97f 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -nightly-2019-01-21 +nightly-2019-01-28