Upgrade rust/crates/crossbeam-utils to 0.8.4 am: f32965f40d

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/crossbeam-utils/+/1714448

Change-Id: Id0ce42f6c4b25f259e9826095f8c41c31bce18c8

8 files changed, 20 insertions, 16 deletions

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 1d9c34d..78aaf0a 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
 {
   "git": {
-    "sha1": "d841a2028dc72b4e09739116f07e865db60f3690"
+    "sha1": "d4f6785c9be365832eecfc04222f95a1c2dd314a"
   }
 }
diff --git a/Android.bp b/Android.bp
index 1a2c24f..8fdf39b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -218,9 +218,9 @@ rust_library {
 // dependent_library ["feature_list"]
 //   autocfg-1.0.1
 //   cfg-if-1.0.0
-//   getrandom-0.2.2 "std"
+//   getrandom-0.2.3 "std"
 //   lazy_static-1.4.0
-//   libc-0.2.93
+//   libc-0.2.94
 //   ppv-lite86-0.2.10 "simd,std"
 //   rand-0.8.3 "alloc,default,getrandom,libc,rand_chacha,rand_hc,std,std_rng"
 //   rand_chacha-0.3.0 "std"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4a92bf..1618732 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 0.8.4
+
+- Bump `loom` dependency to version 0.5. (#686)
+
 # Version 0.8.3
 
 - Make `loom` dependency optional. (#666)
diff --git a/Cargo.toml b/Cargo.toml
index a7d694c..65f9815 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "crossbeam-utils"
-version = "0.8.3"
+version = "0.8.4"
 authors = ["The Crossbeam Project Developers"]
 description = "Utilities for concurrent programming"
 homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils"
@@ -38,5 +38,5 @@ default = ["std"]
 nightly = []
 std = ["lazy_static"]
 [target."cfg(crossbeam_loom)".dependencies.loom]
-version = "0.4"
+version = "0.5"
 optional = true
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 30697d2..4962b71 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -4,7 +4,7 @@ name = "crossbeam-utils"
 # - Update CHANGELOG.md
 # - Update README.md
 # - Create "crossbeam-utils-X.Y.Z" git tag
-version = "0.8.3"
+version = "0.8.4"
 authors = ["The Crossbeam Project Developers"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
@@ -37,7 +37,7 @@ lazy_static = { version = "1.4.0", optional = true }
 # This configuration option is outside of the normal semver guarantees: minor
 # versions of crossbeam may make breaking changes to it at any time.
 [target.'cfg(crossbeam_loom)'.dependencies]
-loom = { version = "0.4", optional = true }
+loom = { version = "0.5", optional = true }
 
 [build-dependencies]
 autocfg = "1.0.0"
diff --git a/METADATA b/METADATA
index e66f8d0..af54cb2 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.3.crate"
+    value: "https://static.crates.io/crates/crossbeam-utils/crossbeam-utils-0.8.4.crate"
   }
-  version: "0.8.3"
+  version: "0.8.4"
   license_type: NOTICE
   last_upgrade_date {
     year: 2021
-    month: 4
-    day: 1
+    month: 5
+    day: 20
   }
 }
diff --git a/README.md b/README.md
index fd0943b..6e9a8e4 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ https://crates.io/crates/crossbeam-utils)
 https://docs.rs/crossbeam-utils)
 [![Rust 1.36+](https://img.shields.io/badge/rust-1.36+-lightgray.svg)](
 https://www.rust-lang.org)
-[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.gg/BBYwKq)
+[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.com/invite/JXYwgWZ)
 
 This crate provides miscellaneous tools for concurrent programming:
 
diff --git a/patches/disable_panic_tests_on_android.patch b/patches/disable_panic_tests_on_android.patch
index 49e4758..3306735 100644
--- a/patches/disable_panic_tests_on_android.patch
+++ b/patches/disable_panic_tests_on_android.patch
@@ -1,5 +1,5 @@
---- tests/sharded_lock.rs
-+++ tests/sharded_lock.rs
+--- a/tests/sharded_lock.rs
++++ b/tests/sharded_lock.rs
 @@ -46,6 +46,8 @@ fn frob() {
  }
  
@@ -63,8 +63,8 @@
  fn test_get_mut_poison() {
      let m = Arc::new(ShardedLock::new(NonCopy(10)));
      let m2 = m.clone();
---- tests/thread.rs
-+++ tests/thread.rs
+--- a/tests/thread.rs
++++ b/tests/thread.rs
 @@ -9,6 +9,8 @@ const THREADS: usize = 10;
  const SMALL_STACK_SIZE: usize = 20;