Snap for 8283941 from 276a49e08ddb6270a8445bc6fea50d040aea6b9c to tm-release
Change-Id: Ia6a7f056019182568e1b57c6825dcd3fd63c5f90
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index e9cf727..f17b5e4 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,6 @@
{
"git": {
- "sha1": "c7d8dcdf4b93a5d80ec4075c3d8e7351c1a32012"
- }
-}
+ "sha1": "4a54e5702e0968bdda77366738ba646f646044e8"
+ },
+ "path_in_vcs": ""
+}
\ No newline at end of file
diff --git a/Android.bp b/Android.bp
index a061761..223fd47 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,7 +42,7 @@
host_supported: true,
crate_name: "thread_local",
cargo_env_compat: true,
- cargo_pkg_version: "1.1.3",
+ cargo_pkg_version: "1.1.4",
srcs: ["src/lib.rs"],
edition: "2018",
rustlibs: [
@@ -55,7 +55,7 @@
host_supported: true,
crate_name: "thread_local",
cargo_env_compat: true,
- cargo_pkg_version: "1.1.3",
+ cargo_pkg_version: "1.1.4",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
diff --git a/Cargo.toml b/Cargo.toml
index 3e76c4c..90e5319 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,17 +3,16 @@
# When uploading crates to the registry Cargo will automatically
# "normalize" Cargo.toml files for maximal compatibility
# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
[package]
edition = "2018"
name = "thread_local"
-version = "1.1.3"
+version = "1.1.4"
authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
description = "Per-object thread-local storage"
documentation = "https://docs.rs/thread_local/"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index a56288f..f2e8ff0 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "thread_local"
-version = "1.1.3"
+version = "1.1.4"
authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
description = "Per-object thread-local storage"
documentation = "https://docs.rs/thread_local/"
diff --git a/METADATA b/METADATA
index ef2ed7c..4c77c6a 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/thread_local/thread_local-1.1.3.crate"
+ value: "https://static.crates.io/crates/thread_local/thread_local-1.1.4.crate"
}
- version: "1.1.3"
+ version: "1.1.4"
license_type: NOTICE
last_upgrade_date {
- year: 2021
- month: 2
- day: 9
+ year: 2022
+ month: 3
+ day: 1
}
}
diff --git a/src/lib.rs b/src/lib.rs
index f26f6ed..33b79d6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -378,7 +378,7 @@
fn next<'a, T: Send + Sync>(&mut self, thread_local: &'a ThreadLocal<T>) -> Option<&'a T> {
while self.bucket < BUCKETS {
let bucket = unsafe { thread_local.buckets.get_unchecked(self.bucket) };
- let bucket = bucket.load(Ordering::Relaxed);
+ let bucket = bucket.load(Ordering::Acquire);
if !bucket.is_null() {
while self.index < self.bucket_size {
