Create an internal new_generic constructor

phil-opp · phil-opp · commit 4a8c18be8f29 · 2023-01-17T14:47:38.000+01:00
diff --git a/src/ptr.rs b/src/ptr.rs
@@ -140,11 +140,7 @@ where
         A: Access,
     {
         let _ = access;
-        VolatilePtr {
-            pointer,
-            reference: PhantomData,
-            access: PhantomData,
-        }
+        unsafe { Self::new_generic(pointer) }
     }
 
     pub fn from_ref(reference: &'a T) -> VolatilePtr<'a, T, ReadOnly>
@@ -153,6 +149,14 @@ where
     {
         unsafe { VolatilePtr::new_restricted(ReadOnly, reference.into()) }
     }
+
+    const unsafe fn new_generic<A>(pointer: NonNull<T>) -> VolatilePtr<'a, T, A> {
+        VolatilePtr {
+            pointer,
+            reference: PhantomData,
+            access: PhantomData,
+        }
+    }
 }
 
 impl<'a, T, A> VolatilePtr<'a, T, A>

Original file line number	Diff line number	Diff line change
`@@ -140,11 +140,7 @@ where`
`140`	`140`	`A: Access,`
`141`	`141`	`{`
`142`	`142`	`let _ = access;`
`143`		`- VolatilePtr {`
`144`		`- pointer,`
`145`		`- reference: PhantomData,`
`146`		`- access: PhantomData,`
`147`		`- }`
	`143`	`+ unsafe { Self::new_generic(pointer) }`
`148`	`144`	`}`
`149`	`145`
`150`	`146`	`pub fn from_ref(reference: &'a T) -> VolatilePtr<'a, T, ReadOnly>`
`@@ -153,6 +149,14 @@ where`
`153`	`149`	`{`
`154`	`150`	`unsafe { VolatilePtr::new_restricted(ReadOnly, reference.into()) }`
`155`	`151`	`}`
	`152`	`+`
	`153`	`+ const unsafe fn new_generic<A>(pointer: NonNull<T>) -> VolatilePtr<'a, T, A> {`
	`154`	`+ VolatilePtr {`
	`155`	`+ pointer,`
	`156`	`+ reference: PhantomData,`
	`157`	`+ access: PhantomData,`
	`158`	`+ }`
	`159`	`+ }`
`156`	`160`	`}`
`157`	`161`
`158`	`162`	`impl<'a, T, A> VolatilePtr<'a, T, A>`