diff options
| author | Ralf Jung <post@ralfj.de> | 2019-02-14 20:00:16 +0100 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2019-02-14 20:07:57 +0100 |
| commit | b5ab2c7f1cf31a642c826047ed1025f4fc13d879 (patch) | |
| tree | db4477f64816879f5c98e617cb376e8fe7d467df /src/liballoc | |
| parent | e54494727855cd14229f5d456591ed2a2f027c46 (diff) | |
| download | rust-b5ab2c7f1cf31a642c826047ed1025f4fc13d879.tar.gz rust-b5ab2c7f1cf31a642c826047ed1025f4fc13d879.zip | |
split MaybeUninit into several features, expand docs a bit
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/collections/btree/node.rs | 4 | ||||
| -rw-r--r-- | src/liballoc/lib.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/liballoc/collections/btree/node.rs b/src/liballoc/collections/btree/node.rs index eb0667228d1..fc1c1878924 100644 --- a/src/liballoc/collections/btree/node.rs +++ b/src/liballoc/collections/btree/node.rs @@ -453,7 +453,7 @@ impl<BorrowType, K, V, Type> NodeRef<BorrowType, K, V, Type> { root: self.root, _marker: PhantomData }, - idx: unsafe { usize::from(*self.as_header().parent_idx.get_ref()) }, + idx: unsafe { usize::from(*self.as_header().parent_idx.as_ptr()) }, _marker: PhantomData }) } else { @@ -1143,7 +1143,7 @@ impl<BorrowType, K, V> NodeRef { height: self.node.height - 1, node: unsafe { - self.node.as_internal().edges.get_unchecked(self.idx).get_ref().as_ptr() + (&*self.node.as_internal().edges.get_unchecked(self.idx).as_ptr()).as_ptr() }, root: self.node.root, _marker: PhantomData diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index d4ee428a3b5..2f23a697a58 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -112,7 +112,7 @@ #![feature(rustc_const_unstable)] #![feature(const_vec_new)] #![feature(slice_partition_dedup)] -#![feature(maybe_uninit)] +#![feature(maybe_uninit, maybe_uninit_slice)] #![feature(alloc_layout_extra)] #![feature(try_trait)] |