diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-08 21:00:02 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-08 21:00:02 +0000 |
commit | 068f9c1ba7560c6842873134efa997286664828e (patch) | |
tree | 5ea8d132ab05426361c61684f35300352fd05ad1 | |
parent | c3fcb6622116e88cd4e40ccd6092171d8ae8cff6 (diff) | |
parent | ec4f2c9361f39bac51834c7f8e5f8e210fe0390b (diff) | |
download | thread_local-068f9c1ba7560c6842873134efa997286664828e.tar.gz |
Merge "Update thread_local to 1.1.4" am: ec4f2c9361
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thread_local/+/2004693
Change-Id: I5607281640c151a769417ea6b471f3b10c621d65
-rw-r--r-- | .cargo_vcs_info.json | 7 | ||||
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | Cargo.toml | 11 | ||||
-rw-r--r-- | Cargo.toml.orig | 2 | ||||
-rw-r--r-- | METADATA | 10 | ||||
-rw-r--r-- | src/lib.rs | 2 |
6 files changed, 18 insertions, 18 deletions
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 @@ -42,7 +42,7 @@ rust_library { 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 @@ rust_test { 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, @@ -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/" @@ -7,13 +7,13 @@ third_party { } 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 } } @@ -378,7 +378,7 @@ impl RawIter { 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 { |