Upgrade to Rust v1.49.0

mvines · Jan 23, 2021 · efd0962 · efd0962
1 parent 7604edb
commit efd0962
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/ci/docker-rust-nightly/Dockerfile b/ci/docker-rust-nightly/Dockerfile
@@ -1,4 +1,4 @@
-FROM solanalabs/rust:1.48.0
+FROM solanalabs/rust:1.49.0
 ARG date
 
 RUN set -x \

diff --git a/ci/docker-rust/Dockerfile b/ci/docker-rust/Dockerfile
@@ -1,6 +1,6 @@
 # Note: when the rust version is changed also modify
 # ci/rust-version.sh to pick up the new image tag
-FROM rust:1.48.0
+FROM rust:1.49.0
 
 # Add Google Protocol Buffers for Libra's metrics library.
 ENV PROTOC_VERSION 3.8.0

diff --git a/ci/rust-version.sh b/ci/rust-version.sh
@@ -18,13 +18,13 @@
 if [[ -n $RUST_STABLE_VERSION ]]; then
   stable_version="$RUST_STABLE_VERSION"
 else
-  stable_version=1.48.0
+  stable_version=1.49.0
 fi
 
 if [[ -n $RUST_NIGHTLY_VERSION ]]; then
   nightly_version="$RUST_NIGHTLY_VERSION"
 else
-  nightly_version=2020-12-13
+  nightly_version=2021-01-23
 fi
 
 

diff --git a/frozen-abi/macro/src/lib.rs b/frozen-abi/macro/src/lib.rs
@@ -78,10 +78,11 @@ fn quote_for_specialization_detection() -> TokenStream2 {
             std::sync::atomic::AtomicBool::new(false);
     }
 
-    if !SPECIALIZATION_DETECTOR_INJECTED.compare_and_swap(
+    if !SPECIALIZATION_DETECTOR_INJECTED.compare_exchange(
         false,
         true,
         std::sync::atomic::Ordering::AcqRel,
+        std::sync::atomic::Ordering::Acquire,
     ) {
         quote! {
             mod specialization_detector {