Upgrade derive_arbitrary to 1.2.3 am: 8b7c82fbf4

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/derive_arbitrary/+/2411888

Change-Id: Ic7537166009e7a5a1bf755b383de9632125d2a24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

6 files changed, 11 insertions, 10 deletions

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 0724802..1f38b6d 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "48c4bfd52b167da94a5db906fe7dd2da7b92215e"
+    "sha1": "98044ba8b0f7d730b500fa3b4f2e96a5edcd926d"
   },
   "path_in_vcs": "derive"
 }
\ No newline at end of file
diff --git a/Android.bp b/Android.bp
index 04e8dca..6e6ef8f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,7 +43,7 @@ rust_proc_macro {
     name: "libderive_arbitrary",
     crate_name: "derive_arbitrary",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.2.0",
+    cargo_pkg_version: "1.2.3",
     srcs: ["src/lib.rs"],
     edition: "2021",
     rustlibs: [
diff --git a/Cargo.toml b/Cargo.toml
index db2f6be..977aa61 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
 edition = "2021"
 rust-version = "1.63.0"
 name = "derive_arbitrary"
-version = "1.2.0"
+version = "1.2.3"
 authors = [
     "The Rust-Fuzz Project Developers",
     "Nick Fitzgerald <fitzgen@gmail.com>",
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index f83eff0..99f5538 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
 [package]
 name = "derive_arbitrary"
-version = "1.2.0" # Make sure it matches the version of the arbitrary crate itself.
+version = "1.2.3" # Make sure it matches the version of the arbitrary crate itself (not including the patch version)
 authors = [
     "The Rust-Fuzz Project Developers",
     "Nick Fitzgerald <fitzgen@gmail.com>",
diff --git a/METADATA b/METADATA
index b3c0616..b987604 100644
--- a/METADATA
+++ b/METADATA
@@ -11,13 +11,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/derive_arbitrary/derive_arbitrary-1.2.0.crate"
+    value: "https://static.crates.io/crates/derive_arbitrary/derive_arbitrary-1.2.3.crate"
   }
-  version: "1.2.0"
+  version: "1.2.3"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2022
-    month: 12
-    day: 5
+    year: 2023
+    month: 2
+    day: 1
   }
 }
diff --git a/src/lib.rs b/src/lib.rs
index 4cd80b6..4ed3817 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -45,11 +45,12 @@ fn expand_derive_arbitrary(input: syn::DeriveInput) -> Result<TokenStream> {
 
     Ok(quote! {
         const _: () = {
-            thread_local! {
+            std::thread_local! {
                 #[allow(non_upper_case_globals)]
                 static #recursive_count: std::cell::Cell<u32> = std::cell::Cell::new(0);
             }
 
+            #[automatically_derived]
             impl #impl_generics arbitrary::Arbitrary<#lifetime_without_bounds> for #name #ty_generics #where_clause {
                 #arbitrary_method
                 #size_hint_method