diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2017-07-14 13:05:21 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2017-07-22 20:38:40 +0200 |
| commit | a4edae95ad0e85b50845be1757670929ff60c88a (patch) | |
| tree | d36d8bff7d97d8193d7d37c0e4e76a1cd9b8b1e5 /src/liballoc | |
| parent | cbd2b6b4842754495a2673df234e2496494245be (diff) | |
| download | rust-a4edae95ad0e85b50845be1757670929ff60c88a.tar.gz rust-a4edae95ad0e85b50845be1757670929ff60c88a.zip | |
Add conversions from references to NonZero pointers, Unique, and Shared
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/btree/node.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/vec.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/vec_deque.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/liballoc/btree/node.rs b/src/liballoc/btree/node.rs index 05ac9cba5e0..a6cbab8497b 100644 --- a/src/liballoc/btree/node.rs +++ b/src/liballoc/btree/node.rs @@ -155,7 +155,7 @@ impl<K, V> BoxedNode<K, V> { fn as_ptr(&self) -> NonZero<*const LeafNode<K, V>> { unsafe { - NonZero::new_unchecked(self.ptr.as_ptr()) + NonZero::from(self.ptr.as_ref()) } } } diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index bc1521c4069..8a1d14b48a1 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -1126,7 +1126,7 @@ impl<T> Vec<T> { tail_start: end, tail_len: len - end, iter: range_slice.iter(), - vec: Shared::new_unchecked(self as *mut _), + vec: Shared::from(self), } } } diff --git a/src/liballoc/vec_deque.rs b/src/liballoc/vec_deque.rs index a99b7bbe053..fdd6c79ef2e 100644 --- a/src/liballoc/vec_deque.rs +++ b/src/liballoc/vec_deque.rs @@ -893,7 +893,7 @@ impl<T> VecDeque<T> { self.head = drain_tail; Drain { - deque: unsafe { Shared::new_unchecked(self as *mut _) }, + deque: Shared::from(&mut *self), after_tail: drain_head, after_head: head, iter: Iter { |