[zerocopy-derive] Fix panic with raw identifiers

Release 0.8.33.

Applies the same approach as in #2788, but to new lines of code (that
should have used this technique to begin with).

gherrit-pr-id: Gc07a814b14897f1beb00786c47a1343e65c9b884

Author: joshlf

Cargo.toml

@@ -15,7 +15,7 @@
 [package]
 edition = "2021"
 name = "zerocopy"
-version = "0.8.32"
+version = "0.8.33"
 authors = [
     "Joshua Liebow-Feeser <joshlf@google.com>",
     "Jack Wrenn <jswrenn@amazon.com>",
@@ -112,13 +112,13 @@ __internal_use_only_features_that_work_on_stable = [
 ]
 
 [dependencies]
-zerocopy-derive = { version = "=0.8.32", path = "zerocopy-derive", optional = true }
+zerocopy-derive = { version = "=0.8.33", path = "zerocopy-derive", optional = true }
 
 # The "associated proc macro pattern" ensures that the versions of zerocopy and
 # zerocopy-derive remain equal, even if the 'derive' feature isn't used.
 # See: https://github.com/matklad/macro-dep-test
 [target.'cfg(any())'.dependencies]
-zerocopy-derive = { version = "=0.8.32", path = "zerocopy-derive" }
+zerocopy-derive = { version = "=0.8.33", path = "zerocopy-derive" }
 
 [dev-dependencies]
 # More recent versions of `either` have an MSRV higher than ours.
@@ -142,4 +142,4 @@ testutil = { path = "testutil" }
 # CI test failures.
 trybuild = { version = "=1.0.89", features = ["diff"] }
 # In tests, unlike in production, zerocopy-derive is not optional
-zerocopy-derive = { version = "=0.8.32", path = "zerocopy-derive" }
+zerocopy-derive = { version = "=0.8.33", path = "zerocopy-derive" }

zerocopy-derive/Cargo.toml

@@ -9,7 +9,7 @@
 [package]
 edition = "2021"
 name = "zerocopy-derive"
-version = "0.8.32"
+version = "0.8.33"
 authors = ["Joshua Liebow-Feeser <joshlf@google.com>", "Jack Wrenn <jswrenn@amazon.com>"]
 description = "Custom derive for traits from the zerocopy crate"
 license = "BSD-2-Clause OR Apache-2.0 OR MIT"

zerocopy-derive/src/lib.rs

@@ -764,7 +764,8 @@ fn derive_has_field_struct_union(
     }
 
     let field_tokens = fields.iter().map(|(vis, ident, _)| {
-        let ident = Ident::new(&format!("ẕ{}", ident), ident.span());
+        let ident_str = to_ident_str(ident);
+        let ident = Ident::new(&format!("ẕ{}", ident_str), ident.span());
         quote!(
             #vis enum #ident {}
         )
@@ -783,7 +784,8 @@ fn derive_has_field_struct_union(
         Data::Enum(..) | Data::Struct(..) => false,
     };
     let has_fields = fields.iter().map(move |(_, ident, ty)| {
-        let field_token = Ident::new(&format!("ẕ{}", ident), ident.span());
+        let ident_str = to_ident_str(ident);
+        let field_token = Ident::new(&format!("ẕ{}", ident_str), ident.span());
         let field: Box<Type> = parse_quote!(#field_token);
         let field_id: Box<Expr> = parse_quote!({ #zerocopy_crate::ident_id!(#ident) });
         ImplBlockBuilder::new(

zerocopy-derive/tests/struct_try_from_bytes.rs

@@ -249,3 +249,11 @@ struct A;
 struct B {
     a: A,
 }
+
+#[derive(imp::TryFromBytes)]
+#[repr(C)]
+struct RawType {
+    r#type: u8,
+}
+
+util_assert_impl_all!(RawType: imp::TryFromBytes);