noteuclid/ownref
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

use more NonNull

Browse Source
This commit is contained in:
numzero 2026-05-07 19:55:00 +03:00
parent 08c5bbd311
commit e0cd965f33
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib.rs
View File

@ -2,7 +2,7 @@ use std::{
marker::PhantomData, marker::PhantomData,
mem::ManuallyDrop, mem::ManuallyDrop,
ops::{Deref, DerefMut}, ops::{Deref, DerefMut},
ptr::{self, NonNull}, ptr::NonNull,
}; };
pub struct OwnRef<'a, T: ?Sized>(Option<NonNull<T>>, PhantomData<&'a mut T>); pub struct OwnRef<'a, T: ?Sized>(Option<NonNull<T>>, PhantomData<&'a mut T>);
@ -10,7 +10,7 @@ pub struct OwnRef<'a, T: ?Sized>(Option<NonNull<T>>, PhantomData<&'a mut T>);
impl<T: ?Sized> Drop for OwnRef<'_, T> { impl<T: ?Sized> Drop for OwnRef<'_, T> {
fn drop(&mut self) { fn drop(&mut self) {
let Some(p) = self.0 else { return }; 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<T: ?Sized> DerefMut for OwnRef<'_, T> {
} }
impl<T: ?Sized> OwnRef<'_, T> { impl<T: ?Sized> OwnRef<'_, T> {
pub unsafe fn new_unchecked(p: *mut T) -> Self { pub unsafe fn new_unchecked(p: NonNull<T>) -> Self {
Self(Some(NonNull::new(p).unwrap()), PhantomData) Self(Some(p), PhantomData)
} }
} }
impl<'a, T: ?Sized> OwnRef<'a, T> { impl<'a, T: ?Sized> OwnRef<'a, T> {
pub unsafe fn from_manually_drop(p: &'a mut ManuallyDrop<T>) -> Self { pub unsafe fn from_manually_drop(p: &'a mut ManuallyDrop<T>) -> Self {
unsafe { Self::new_unchecked(p.deref_mut() as *mut _) } unsafe { Self::new_unchecked(p.deref_mut().into()) }
} }
} }