From 4021daa72f8d5986a651e8532bbe1c3120868144 Mon Sep 17 00:00:00 2001 From: KodrAus Date: Tue, 14 Jan 2025 19:56:38 +1000 Subject: [PATCH] fix up zerocopy derives --- src/lib.rs | 5 +---- src/non_nil.rs | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 46abceb5..edd66430 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -222,9 +222,6 @@ extern crate std; #[macro_use] extern crate core as std; -#[cfg(all(uuid_unstable, feature = "zerocopy"))] -use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout, Unaligned}; - mod builder; mod error; mod non_nil; @@ -441,7 +438,7 @@ pub enum Variant { // NOTE: Also check `NonNilUuid` when ading new derives here #[cfg_attr( all(uuid_unstable, feature = "zerocopy"), - derive(IntoBytes, FromBytes, KnownLayout, Immutable, Unaligned) + derive(zerocopy::IntoBytes, zerocopy::FromBytes, zerocopy::KnownLayout, zerocopy::Immutable, zerocopy::Unaligned) )] #[cfg_attr( feature = "borsh", diff --git a/src/non_nil.rs b/src/non_nil.rs index 66bd0ba9..93826543 100644 --- a/src/non_nil.rs +++ b/src/non_nil.rs @@ -28,7 +28,7 @@ use crate::{ /// - [`Uuid::new_v8`] #[cfg_attr( all(uuid_unstable, feature = "zerocopy"), - derive(IntoBytes, FromBytes, KnownLayout, Immutable, Unaligned) + derive(zerocopy::IntoBytes, zerocopy::FromBytes, zerocopy::KnownLayout, zerocopy::Immutable, zerocopy::Unaligned) )] #[cfg_attr( feature = "borsh",