Fix zerocopy build errors

Author: Kestrer

.gitignore

@@ -1,2 +1 @@
 target
-Cargo.lock

Cargo.lock

@@ -15,7 +15,7 @@ arbitrary1 = { package = "arbitrary", version = "1.0.2", optional = true }
 bytemuck1 = { package = "bytemuck", version = "1.7.2", optional = true }
 num-traits02 = { package = "num-traits", version = "0.2.14", default-features = false, features = ["i128"], optional = true }
 serde1 = { package = "serde", version = "1.0.124", default-features = false, optional = true }
-zerocopy06 = { package = "zerocopy", version = "0.6", optional = true }
+zerocopy = { version = "0.8.14", features = ["derive"], optional = true }
 
 [features]
 std = ["alloc"]

Cargo.toml

@@ -46,16 +46,10 @@ fn generate_item(item: &BoundedInteger, tokens: &mut TokenStream) {
     let repr = &item.repr;
     let crate_path = &item.crate_path;
 
-    if item.zerocopy06 {
-        let zerocopy = quote!(#crate_path::__private::zerocopy06);
+    if item.zerocopy {
+        let zerocopy = quote!(#crate_path::__private::zerocopy);
 
-        // Zerocopy is not hygienic: https://bugs.fuchsia.dev/p/fuchsia/issues/detail?id=84476
-        tokens.extend(quote! {
-            use ::core::marker::Sized;
-            use #zerocopy as zerocopy;
-        });
-
-        tokens.extend(quote!(#[derive(#zerocopy::AsBytes)]));
+        tokens.extend(quote!(#[derive(#zerocopy::IntoBytes)]));
         if let ReprSize::Fixed(ReprSizeFixed::Fixed8) = item.repr.size {
             tokens.extend(quote!(#[derive(#zerocopy::Unaligned)]));
         }

macro/src/generate.rs

@@ -64,7 +64,7 @@ struct BoundedInteger {
     bytemuck1: bool,
     serde1: bool,
     std: bool,
-    zerocopy06: bool,
+    zerocopy: bool,
     step_trait: bool,
 
     // The item itself
@@ -86,7 +86,7 @@ impl Parse for BoundedInteger {
         let bytemuck1 = input.parse::<LitBool>()?.value;
         let serde1 = input.parse::<LitBool>()?.value;
         let std = input.parse::<LitBool>()?.value;
-        let zerocopy06 = input.parse::<LitBool>()?.value;
+        let zerocopy = input.parse::<LitBool>()?.value;
         let step_trait = input.parse::<LitBool>()?.value;
 
         let mut attrs = input.call(Attribute::parse_outer)?;
@@ -163,7 +163,7 @@ impl Parse for BoundedInteger {
             bytemuck1,
             serde1,
             std,
-            zerocopy06,
+            zerocopy,
             step_trait,
             attrs,
             repr,

macro/src/lib.rs

@@ -62,8 +62,8 @@
 //!   [`SaturatingSub`] for all const-generic bounded integers.
 //! - `serde1`: Implement [`Serialize`] and [`Deserialize`] for the bounded integers, making sure all
 //!   values will never be out of bounds. This has a deprecated alias `serde`.
-//! - `zerocopy06`: Implement [`AsBytes`] for all bounded integers, and [`Unaligned`] for
-//!   macro-generated ones.
+//! - `zerocopy`: Implement [`IntoBytes`] for all bounded integers,
+//!   and [`Unaligned`] for suitable macro-generated ones.
 //! - `step_trait`: Implement the [`Step`] trait which allows the bounded integers to be easily used
 //!   in ranges. This will require you to use nightly and place `#![feature(step_trait)]` in your
 //!   crate root if you use the macro.
@@ -90,8 +90,8 @@
 //! [`SaturatingSub`]: https://docs.rs/num-traits/0.2/num_traits/ops/saturating/trait.SaturatingSub.html
 //! [`Serialize`]: https://docs.rs/serde/1/serde/trait.Serialize.html
 //! [`Deserialize`]: https://docs.rs/serde/1/serde/trait.Deserialize.html
-//! [`AsBytes`]: https://docs.rs/zerocopy/0.6/zerocopy/trait.AsBytes.html
-//! [`Unaligned`]: https://docs.rs/zerocopy/0.6/zerocopy/trait.Unaligned.html
+//! [`IntoBytes`]: https://docs.rs/zerocopy/0.8/zerocopy/trait.IntoBytes.html
+//! [`Unaligned`]: https://docs.rs/zerocopy/0.8/zerocopy/trait.Unaligned.html
 //! [`Step`]: https://doc.rust-lang.org/nightly/core/iter/trait.Step.html
 //! [`Error`]: https://doc.rust-lang.org/stable/std/error/trait.Error.html
 //! [`ParseError`]: https://docs.rs/bounded-integer/*/bounded_integer/struct.ParseError.html
@@ -126,8 +126,8 @@ pub mod __private {
     #[cfg(feature = "serde1")]
     pub use ::serde1;
 
-    #[cfg(feature = "zerocopy06")]
-    pub use ::zerocopy06;
+    #[cfg(feature = "zerocopy")]
+    pub use ::zerocopy;
 
     pub use bounded_integer_macro::bounded_integer as proc_macro;
 
@@ -238,7 +238,7 @@ block! {
     let bytemuck1: ident = cfg_bool!(feature = "bytemuck1");
     let serde1: ident = cfg_bool!(feature = "serde1");
     let std: ident = cfg_bool!(feature = "std");
-    let zerocopy06: ident = cfg_bool!(feature = "zerocopy06");
+    let zerocopy: ident = cfg_bool!(feature = "zerocopy");
     let step_trait: ident = cfg_bool!(feature = "step_trait");
     let d: tt = dollar!();
 
@@ -247,7 +247,7 @@ block! {
     macro_rules! __bounded_integer_inner2 {
         ($d($d tt:tt)*) => {
             $crate::__private::proc_macro! {
-                [$crate] $alloc $arbitrary1 $bytemuck1 $serde1 $std $zerocopy06 $step_trait $d($d tt)*
+                [$crate] $alloc $arbitrary1 $bytemuck1 $serde1 $std $zerocopy $step_trait $d($d tt)*
             }
         };
     }

src/lib.rs

@@ -175,7 +175,7 @@ macro_rules! define_bounded_integers {
         #[cfg_attr(doc_cfg, doc(cfg(feature = "types")))]
         #[repr(transparent)]
         #[derive(Debug, Hash, Clone, Copy, Eq, Ord)]
-        #[cfg_attr(feature = "zerocopy06", derive(zerocopy06::AsBytes))]
+        #[cfg_attr(feature = "zerocopy", derive(zerocopy::IntoBytes))]
         pub struct Bounded<const MIN: Inner, const MAX: Inner>(Inner);
 
         impl<const MIN: Inner, const MAX: Inner> Bounded<MIN, MAX> {