From a4edae95ad0e85b50845be1757670929ff60c88a Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Fri, 14 Jul 2017 13:05:21 +0200
Subject: Add conversions from references to NonZero pointers, Unique, and
 Shared

---
 src/liballoc/btree/node.rs | 2 +-
 src/liballoc/vec.rs        | 2 +-
 src/liballoc/vec_deque.rs  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/liballoc')

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 {
-- 
cgit 1.4.1-3-g733a5