Access alloc field directly in Arc/Rc::into_raw_with_allocator.

... since fn allocator doesn't exist yet.
rust-lang-ci · May 17, 2024 · c895f6e · c895f6e
1 parent 28cb2d7
commit c895f6e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/library/alloc/src/rc.rs b/library/alloc/src/rc.rs
@@ -1379,7 +1379,7 @@ impl<T: ?Sized, A: Allocator> Rc<T, A> {
         let this = mem::ManuallyDrop::new(this);
         let ptr = Self::as_ptr(&this);
         // Safety: `this` is ManuallyDrop so the allocator will not be double-dropped
-        let alloc = unsafe { ptr::read(Self::allocator(&this)) };
+        let alloc = unsafe { ptr::read(&this.alloc) };
         (ptr, alloc)
     }
 
@@ -3061,7 +3061,7 @@ impl<T: ?Sized, A: Allocator> Weak<T, A> {
         let this = mem::ManuallyDrop::new(self);
         let result = this.as_ptr();
         // Safety: `this` is ManuallyDrop so the allocator will not be double-dropped
-        let alloc = unsafe { ptr::read(this.allocator()) };
+        let alloc = unsafe { ptr::read(&this.alloc) };
         (result, alloc)
     }
 

diff --git a/library/alloc/src/sync.rs b/library/alloc/src/sync.rs
@@ -1520,7 +1520,7 @@ impl<T: ?Sized, A: Allocator> Arc<T, A> {
         let this = mem::ManuallyDrop::new(this);
         let ptr = Self::as_ptr(&this);
         // Safety: `this` is ManuallyDrop so the allocator will not be double-dropped
-        let alloc = unsafe { ptr::read(Self::allocator(&this)) };
+        let alloc = unsafe { ptr::read(&this.alloc) };
         (ptr, alloc)
     }
 
@@ -2803,7 +2803,7 @@ impl<T: ?Sized, A: Allocator> Weak<T, A> {
         let this = mem::ManuallyDrop::new(self);
         let result = this.as_ptr();
         // Safety: `this` is ManuallyDrop so the allocator will not be double-dropped
-        let alloc = unsafe { ptr::read(Self::allocator(&this)) };
+        let alloc = unsafe { ptr::read(&this.alloc) };
         (result, alloc)
     }