From 36d663fcfc7a219f034ecdd219f03517e17db62d Mon Sep 17 00:00:00 2001
From: Nikolai Vazquez <nvazquez1297@gmail.com>
Date: Wed, 27 Sep 2017 14:56:20 -0400
Subject: Remove mem::transmute used in Box<str> conversions

---
 src/liballoc/boxed.rs | 4 +---
 src/liballoc/str.rs   | 8 +++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/liballoc')

diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs
index 4341b0b2975..35c8530b4dd 100644
--- a/src/liballoc/boxed.rs
+++ b/src/liballoc/boxed.rs
@@ -528,9 +528,7 @@ impl<'a> From<&'a str> for Box<str> {
 #[stable(feature = "boxed_str_conv", since = "1.19.0")]
 impl From<Box<str>> for Box<[u8]> {
     fn from(s: Box<str>) -> Self {
-        unsafe {
-            mem::transmute(s)
-        }
+        unsafe { Box::from_raw(Box::into_raw(s) as *mut [u8]) }
     }
 }
 
diff --git a/src/liballoc/str.rs b/src/liballoc/str.rs
index 62b5f13675c..830128f2b9f 100644
--- a/src/liballoc/str.rs
+++ b/src/liballoc/str.rs
@@ -2047,10 +2047,8 @@ impl str {
     /// ```
     #[stable(feature = "box_str", since = "1.4.0")]
     pub fn into_string(self: Box<str>) -> String {
-        unsafe {
-            let slice = mem::transmute::<Box<str>, Box<[u8]>>(self);
-            String::from_utf8_unchecked(slice.into_vec())
-        }
+        let slice = Box::<[u8]>::from(self);
+        unsafe { String::from_utf8_unchecked(slice.into_vec()) }
     }
 
     /// Create a [`String`] by repeating a string `n` times.
@@ -2087,5 +2085,5 @@ impl str {
 /// ```
 #[stable(feature = "str_box_extras", since = "1.20.0")]
 pub unsafe fn from_boxed_utf8_unchecked(v: Box<[u8]>) -> Box<str> {
-    mem::transmute(v)
+    Box::from_raw(Box::into_raw(v) as *mut str)
 }
-- 
cgit 1.4.1-3-g733a5