From e0cd965f33ea436ba48dda4cbe9a10dd4c99b50f Mon Sep 17 00:00:00 2001 From: numzero Date: Thu, 7 May 2026 19:55:00 +0300 Subject: [PATCH] use more NonNull --- src/lib.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index aca9ed2..aa1311a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,7 +2,7 @@ use std::{ marker::PhantomData, mem::ManuallyDrop, ops::{Deref, DerefMut}, - ptr::{self, NonNull}, + ptr::NonNull, }; pub struct OwnRef<'a, T: ?Sized>(Option>, PhantomData<&'a mut T>); @@ -10,7 +10,7 @@ pub struct OwnRef<'a, T: ?Sized>(Option>, PhantomData<&'a mut T>); impl Drop for OwnRef<'_, T> { fn drop(&mut self) { let Some(p) = self.0 else { return }; - unsafe { ptr::drop_in_place(p.as_ptr()) }; + unsafe { p.drop_in_place() }; } } @@ -28,14 +28,14 @@ impl DerefMut for OwnRef<'_, T> { } impl OwnRef<'_, T> { - pub unsafe fn new_unchecked(p: *mut T) -> Self { - Self(Some(NonNull::new(p).unwrap()), PhantomData) + pub unsafe fn new_unchecked(p: NonNull) -> Self { + Self(Some(p), PhantomData) } } impl<'a, T: ?Sized> OwnRef<'a, T> { pub unsafe fn from_manually_drop(p: &'a mut ManuallyDrop) -> Self { - unsafe { Self::new_unchecked(p.deref_mut() as *mut _) } + unsafe { Self::new_unchecked(p.deref_mut().into()) } } }