From 5d33efb9dcedac03eb9a19b6d0d639f44238166a Mon Sep 17 00:00:00 2001 From: Ilka Schulz Date: Sat, 20 Jun 2026 17:00:06 +0200 Subject: [PATCH] fix remaining regression in doctests --- rosenpass/src/msgs.rs | 10 ++++----- rosenpass/src/protocol/protocol.rs | 2 +- util/src/zerocopy/ref_maker.rs | 12 +++++------ util/src/zerocopy/zerocopy_ref_ext.rs | 10 ++++----- util/src/zerocopy/zerocopy_slice_ext.rs | 28 ++++++++++++------------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/rosenpass/src/msgs.rs b/rosenpass/src/msgs.rs index 66e8fc38..5f648dd5 100644 --- a/rosenpass/src/msgs.rs +++ b/rosenpass/src/msgs.rs @@ -51,7 +51,7 @@ pub type MsgEnvelopeCookie = [u8; COOKIE_SIZE]; /// /// ``` /// use rosenpass::msgs::{Envelope, InitHello}; -/// use zerocopy::{IntoBytes, FromBytes, Ref, FromZeroes}; +/// use zerocopy::{IntoBytes, FromBytes, Ref, FromZeros}; /// use memoffset::offset_of; /// /// // Zero-initialization @@ -106,7 +106,7 @@ pub struct Envelope { /// /// ``` /// use rosenpass::msgs::{Envelope, InitHello}; -/// use zerocopy::{IntoBytes, FromBytes, Ref, FromZeroes}; +/// use zerocopy::{IntoBytes, FromBytes, Ref, FromZeros}; /// use memoffset::span_of; /// /// // Zero initialization @@ -155,7 +155,7 @@ pub struct InitHello { /// /// ``` /// use rosenpass::msgs::{Envelope, RespHello}; -/// use zerocopy::{IntoBytes, FromBytes, Ref, FromZeroes}; +/// use zerocopy::{IntoBytes, FromBytes, Ref, FromZeros}; /// use memoffset::span_of; /// /// // Zero initialization @@ -206,7 +206,7 @@ pub struct RespHello { /// /// ``` /// use rosenpass::msgs::{Envelope, InitConf}; -/// use zerocopy::{IntoBytes, FromBytes, Ref, FromZeroes}; +/// use zerocopy::{IntoBytes, FromBytes, Ref, FromZeros}; /// use memoffset::span_of; /// /// // Zero initialization @@ -264,7 +264,7 @@ pub struct InitConf { /// /// ``` /// use rosenpass::msgs::{Envelope, EmptyData}; -/// use zerocopy::{IntoBytes, FromBytes, Ref, FromZeroes}; +/// use zerocopy::{IntoBytes, FromBytes, Ref, FromZeros}; /// use memoffset::span_of; /// /// // Zero initialization diff --git a/rosenpass/src/protocol/protocol.rs b/rosenpass/src/protocol/protocol.rs index 61b9d88a..5cbb245e 100644 --- a/rosenpass/src/protocol/protocol.rs +++ b/rosenpass/src/protocol/protocol.rs @@ -464,7 +464,7 @@ pub type KnownResponseHash = Public<16>; /// # Examples /// /// ``` -/// use zerocopy::FromZeroes; +/// use zerocopy::FromZeros; /// use rosenpass::protocol::KnownResponseHasher; /// use rosenpass::msgs::{Envelope, InitConf}; /// diff --git a/util/src/zerocopy/ref_maker.rs b/util/src/zerocopy/ref_maker.rs index 8ff3633f..5bfb150f 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, KnownLayout, Immutable}; /// # use rosenpass_util::zerocopy::RefMaker; /// -/// #[derive(FromBytes, FromZeroes, AsBytes)] +/// #[derive(FromBytes, IntoBytes, KnownLayout, Immutable)] /// #[repr(C)] /// struct Header { /// field1: u32, @@ -93,10 +93,10 @@ impl RefMaker { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes, Ref}; + /// # use zerocopy::{IntoBytes, FromBytes, KnownLayout, Immutable, Ref}; /// # use rosenpass_util::zerocopy::RefMaker; /// - /// #[derive(FromBytes, FromZeroes, AsBytes, Debug)] + /// #[derive(FromBytes, IntoBytes, KnownLayout, Immutable, Debug)] /// #[repr(C)] /// struct Data(u32); /// @@ -319,9 +319,9 @@ impl RefMaker { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes, Ref}; /// + /// # use zerocopy::{IntoBytes, FromBytes, FromZeros, Ref, KnownLayout, Immutable}; /// # use rosenpass_util::zerocopy::RefMaker; - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, KnownLayout, Immutable)] /// #[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 8a3d88d4..563a3096 100644 --- a/util/src/zerocopy/zerocopy_ref_ext.rs +++ b/util/src/zerocopy/zerocopy_ref_ext.rs @@ -16,15 +16,15 @@ pub trait ZerocopyEmancipateExt { /// /// ``` /// # use std::ops::Deref; - /// # use zerocopy::{AsBytes, ByteSlice, FromBytes, FromZeroes, Ref}; + /// # use zerocopy::{IntoBytes, ByteSlice, FromBytes, KnownLayout, Immutable, Ref}; /// # use rosenpass_util::zerocopy::ZerocopyEmancipateExt; - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, KnownLayout, Immutable)] /// #[repr(C)] /// struct Data(u32); /// #[repr(align(4))] /// struct AlignedBuf([u8; 4]); /// let bytes = AlignedBuf([0xAA, 0xBB, 0xCC, 0xDD]); - /// let r = Ref::<&[u8], Data>::new(&bytes.0).unwrap(); + /// let r = Ref::<&[u8], Data>::from_bytes(&bytes.0).unwrap(); /// let emancipated: Ref<&[u8], Data> = r.emancipate(); // same data, but guaranteed &[u8] backing /// assert_eq!(emancipated.0, 0xDDCCBBAA); /// ``` @@ -44,9 +44,9 @@ pub trait ZerocopyEmancipateMutExt { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes, Ref}; + /// # use zerocopy::{IntoBytes, FromBytes, KnownLayout, Immutable, Ref}; /// # use rosenpass_util::zerocopy::{ZerocopyEmancipateMutExt}; - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, KnownLayout, Immutable)] /// #[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 25c1b668..04ab0d06 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 + ByteSlice { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes}; + /// # use zerocopy::{IntoBytes, FromBytes, KnownLayout, Immutable}; /// # use rosenpass_util::zerocopy::{RefMaker, ZerocopySliceExt}; /// - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, KnownLayout, Immutable)] /// #[repr(C)] /// struct Data(u32); /// @@ -39,10 +39,10 @@ pub trait ZerocopySliceExt: Sized + ByteSlice { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes}; + /// # use zerocopy::{IntoBytes, FromBytes, KnownLayout, Immutable}; /// # use rosenpass_util::zerocopy::ZerocopySliceExt; /// - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, KnownLayout, Immutable)] /// #[repr(C)] /// struct Data(u16, u16); /// #[repr(align(4))] @@ -70,9 +70,9 @@ pub trait ZerocopySliceExt: Sized + ByteSlice { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes}; + /// # use zerocopy::{IntoBytes, FromBytes, KnownLayout, Immutable}; /// # use rosenpass_util::zerocopy::ZerocopySliceExt; - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, KnownLayout, Immutable)] /// #[repr(C)] /// struct Header(u32); /// #[repr(align(4))] @@ -102,9 +102,9 @@ pub trait ZerocopySliceExt: Sized + ByteSlice { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes}; + /// # use zerocopy::{IntoBytes, FromBytes, KnownLayout, Immutable}; /// # use rosenpass_util::zerocopy::ZerocopySliceExt; - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, KnownLayout, Immutable)] /// #[repr(C)] /// struct Header(u32); /// #[repr(align(4))] @@ -142,9 +142,9 @@ pub trait ZerocopyMutSliceExt: ZerocopySliceExt + Sized + ByteSliceMut { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes}; + /// # use zerocopy::{IntoBytes, FromBytes, KnownLayout, Immutable}; /// # use rosenpass_util::zerocopy::ZerocopyMutSliceExt; - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, KnownLayout, Immutable)] /// #[repr(C)] /// struct Data([u8; 4]); /// #[repr(align(4))] @@ -173,9 +173,9 @@ pub trait ZerocopyMutSliceExt: ZerocopySliceExt + Sized + ByteSliceMut { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes}; + /// # use zerocopy::{IntoBytes, FromBytes, KnownLayout, Immutable}; /// # use rosenpass_util::zerocopy::ZerocopyMutSliceExt; - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, KnownLayout, Immutable)] /// #[repr(C)] /// struct Data([u8; 4]); /// #[repr(align(4))] @@ -205,9 +205,9 @@ pub trait ZerocopyMutSliceExt: ZerocopySliceExt + Sized + ByteSliceMut { /// # Example /// /// ``` - /// # use zerocopy::{AsBytes, FromBytes, FromZeroes}; + /// # use zerocopy::{IntoBytes, FromBytes, KnownLayout, Immutable}; /// # use rosenpass_util::zerocopy::ZerocopyMutSliceExt; - /// #[derive(FromBytes, FromZeroes, AsBytes)] + /// #[derive(FromBytes, IntoBytes, KnownLayout, Immutable)] /// #[repr(C)] /// struct Data([u8; 4]); /// #[repr(align(4))]