diff --git a/util/src/zerocopy/ref_maker.rs b/util/src/zerocopy/ref_maker.rs index ffebf3e..ad39315 100644 --- a/util/src/zerocopy/ref_maker.rs +++ b/util/src/zerocopy/ref_maker.rs @@ -19,10 +19,10 @@ use crate::zeroize::ZeroizedExt; /// # Example /// /// ``` -/// # use zerocopy::{AsBytes, FromBytes, FromZeroes, Ref};/// +/// # use zerocopy::{IntoBytes, FromBytes, Ref, Immutable, KnownLayout}; /// # use rosenpass_util::zerocopy::RefMaker; /// -/// #[derive(FromBytes, FromZeroes, AsBytes)] +/// #[derive(FromBytes, IntoBytes, Immutable, KnownLayout)] /// #[repr(C)] /// struct Header { /// field1: u32, @@ -97,10 +97,10 @@ where /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes, Ref}; + /// # use zerocopy::{IntoBytes, FromBytes, Ref, Immutable, KnownLayout}; /// # use rosenpass_util::zerocopy::RefMaker; /// - /// #[derive(FromBytes, FromZeroes, AsBytes, Debug)] + /// #[derive(FromBytes, IntoBytes, Debug, Immutable, KnownLayout)] /// #[repr(C)] /// struct Data(u32); /// @@ -119,7 +119,7 @@ where /// let bytes = [1u8, 2, 3, 4, 5, 6, 7, 8]; /// let parse_error = RefMaker::<_, Data>::new(&bytes[1..5]).parse() /// .expect_err("Should error"); - /// assert_eq!(parse_error.to_string(), "Parser error!"); + /// assert_eq!(parse_error.to_string(), "Parser error: Alignment(AlignmentError)"); /// ``` pub fn parse(self) -> anyhow::Result> { self.ensure_fit()?; @@ -310,9 +310,9 @@ where /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes, Ref}; /// + /// # use zerocopy::{IntoBytes, FromBytes, Ref, Immutable, KnownLayout}; /// # use rosenpass_util::zerocopy::RefMaker; - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, Immutable, KnownLayout)] /// #[repr(C)] /// struct Data([u8; 4]); /// diff --git a/util/src/zerocopy/zerocopy_ref_ext.rs b/util/src/zerocopy/zerocopy_ref_ext.rs index c8de12c..dd63577 100644 --- a/util/src/zerocopy/zerocopy_ref_ext.rs +++ b/util/src/zerocopy/zerocopy_ref_ext.rs @@ -16,9 +16,9 @@ pub trait ZerocopyEmancipateExt { /// /// ``` /// # use std::ops::Deref; - /// # use zerocopy::{AsBytes, SplitByteSlice, FromBytes, FromZeroes, Ref}; + /// # use zerocopy::{IntoBytes, SplitByteSlice, FromBytes, FromZeros, Ref, Immutable, KnownLayout}; /// # use rosenpass_util::zerocopy::ZerocopyEmancipateExt; - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, Immutable, KnownLayout)] /// #[repr(C)] /// struct Data(u32); /// #[repr(align(4))] @@ -44,9 +44,9 @@ pub trait ZerocopyEmancipateMutExt { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes, Ref}; + /// # use zerocopy::{IntoBytes, FromBytes, Ref, Immutable, KnownLayout}; /// # use rosenpass_util::zerocopy::{ZerocopyEmancipateMutExt}; - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, Immutable, KnownLayout)] /// #[repr(C)] /// struct Data(u32); /// #[repr(align(4))] diff --git a/util/src/zerocopy/zerocopy_slice_ext.rs b/util/src/zerocopy/zerocopy_slice_ext.rs index 27a4214..3507a72 100644 --- a/util/src/zerocopy/zerocopy_slice_ext.rs +++ b/util/src/zerocopy/zerocopy_slice_ext.rs @@ -15,10 +15,10 @@ pub trait ZerocopySliceExt: Sized + SplitByteSlice { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes}; + /// # use zerocopy::{IntoBytes, FromBytes, Immutable, KnownLayout}; /// # use rosenpass_util::zerocopy::{RefMaker, ZerocopySliceExt}; /// - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, Immutable, KnownLayout)] /// #[repr(C)] /// struct Data(u32); /// @@ -39,10 +39,10 @@ pub trait ZerocopySliceExt: Sized + SplitByteSlice { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes}; + /// # use zerocopy::{IntoBytes, FromBytes, Immutable, KnownLayout}; /// # use rosenpass_util::zerocopy::ZerocopySliceExt; /// - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, Immutable, KnownLayout)] /// #[repr(C)] /// struct Data(u16, u16); /// #[repr(align(4))] @@ -70,9 +70,9 @@ pub trait ZerocopySliceExt: Sized + SplitByteSlice { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes}; + /// # use zerocopy::{IntoBytes, FromBytes, Immutable, KnownLayout}; /// # use rosenpass_util::zerocopy::ZerocopySliceExt; - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, Immutable, KnownLayout)] /// #[repr(C)] /// struct Header(u32); /// #[repr(align(4))] @@ -101,9 +101,9 @@ pub trait ZerocopySliceExt: Sized + SplitByteSlice { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes}; + /// # use zerocopy::{IntoBytes, FromBytes, Immutable, KnownLayout}; /// # use rosenpass_util::zerocopy::ZerocopySliceExt; - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, Immutable, KnownLayout)] /// #[repr(C)] /// struct Header(u32); /// #[repr(align(4))] @@ -140,9 +140,9 @@ pub trait ZerocopyMutSliceExt: ZerocopySliceExt + Sized + SplitByteSliceMut { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes}; + /// # use zerocopy::{IntoBytes, FromBytes, Immutable, KnownLayout}; /// # use rosenpass_util::zerocopy::ZerocopyMutSliceExt; - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, Immutable, KnownLayout)] /// #[repr(C)] /// struct Data([u8; 4]); /// #[repr(align(4))] @@ -171,9 +171,9 @@ pub trait ZerocopyMutSliceExt: ZerocopySliceExt + Sized + SplitByteSliceMut { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes}; + /// # use zerocopy::{IntoBytes, FromBytes, Immutable, KnownLayout}; /// # use rosenpass_util::zerocopy::ZerocopyMutSliceExt; - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, Immutable, KnownLayout)] /// #[repr(C)] /// struct Data([u8; 4]); /// #[repr(align(4))] @@ -202,9 +202,9 @@ pub trait ZerocopyMutSliceExt: ZerocopySliceExt + Sized + SplitByteSliceMut { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes}; + /// # use zerocopy::{IntoBytes, FromBytes, Immutable, KnownLayout}; /// # use rosenpass_util::zerocopy::ZerocopyMutSliceExt; - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, Immutable, KnownLayout)] /// #[repr(C)] /// struct Data([u8; 4]); /// #[repr(align(4))]