diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-04-27 03:26:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 03:26:18 +0200 |
| commit | cddbed00032080b947542307249fa141331887be (patch) | |
| tree | 6dc0d7cfdd4110013c077875d31a9a9fb7da9cc7 /src/liballoc | |
| parent | ac62dcef0500c8e68b5f292d72d76865969ea2b1 (diff) | |
| parent | 7aebdb639ade703a2a9f55a83df21a79fbbd9f69 (diff) | |
| download | rust-cddbed00032080b947542307249fa141331887be.tar.gz rust-cddbed00032080b947542307249fa141331887be.zip | |
Rollup merge of #71589 - RalfJung:unique-no-shr, r=SimonSapin
remove Unique::from for shared pointer types r? @SimonSapin
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/collections/btree/node.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/raw_vec.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/liballoc/collections/btree/node.rs b/src/liballoc/collections/btree/node.rs index 84d34db2d45..5569c293e2f 100644 --- a/src/liballoc/collections/btree/node.rs +++ b/src/liballoc/collections/btree/node.rs @@ -131,7 +131,7 @@ impl<K, V> BoxedNode<K, V> { } unsafe fn from_ptr(ptr: NonNull<LeafNode<K, V>>) -> Self { - BoxedNode { ptr: Unique::from(ptr) } + BoxedNode { ptr: Unique::new_unchecked(ptr.as_ptr()) } } fn as_ptr(&self) -> NonNull<LeafNode<K, V>> { diff --git a/src/liballoc/raw_vec.rs b/src/liballoc/raw_vec.rs index 0780b33e53a..ca165b61e26 100644 --- a/src/liballoc/raw_vec.rs +++ b/src/liballoc/raw_vec.rs @@ -151,7 +151,7 @@ impl<T, A: AllocRef> RawVec<T, A> { let memory = alloc.alloc(layout, init).unwrap_or_else(|_| handle_alloc_error(layout)); Self { - ptr: memory.ptr.cast().into(), + ptr: unsafe { Unique::new_unchecked(memory.ptr.cast().as_ptr()) }, cap: Self::capacity_from_bytes(memory.size), alloc, } @@ -469,7 +469,7 @@ impl<T, A: AllocRef> RawVec<T, A> { } fn set_memory(&mut self, memory: MemoryBlock) { - self.ptr = memory.ptr.cast().into(); + self.ptr = unsafe { Unique::new_unchecked(memory.ptr.cast().as_ptr()) }; self.cap = Self::capacity_from_bytes(memory.size); } |
