Test fixes and rebase conflicts from rollup

1 files changed, 6 insertions, 6 deletions

diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs
index f7a84fc3478..c2e88bfdbcf 100644
--- a/src/libstd/ascii.rs
+++ b/src/libstd/ascii.rs
@@ -259,9 +259,9 @@ impl OwnedAsciiCast for Vec<u8> {
 
     #[inline]
     unsafe fn into_ascii_nocheck(self) -> Vec<Ascii> {
-        let v = Vec::from_raw_parts(self.len(),
-                                    self.capacity(),
-                                    mem::transmute(self.as_ptr()));
+        let v = Vec::from_raw_parts(self.as_ptr() as *mut Ascii,
+                                    self.len(),
+                                    self.capacity());
 
         // We forget `self` to avoid freeing it at the end of the scope
         // Otherwise, the returned `Vec` would point to freed memory
@@ -345,9 +345,9 @@ pub trait IntoBytes {
 impl IntoBytes for Vec<Ascii> {
     fn into_bytes(self) -> Vec<u8> {
         unsafe {
-            let v = Vec::from_raw_parts(self.len(),
-                                        self.capacity(),
-                                        mem::transmute(self.as_ptr()));
+            let v = Vec::from_raw_parts(self.as_ptr() as *mut u8,
+                                        self.len(),
+                                        self.capacity());
 
             // We forget `self` to avoid freeing it at the end of the scope
             // Otherwise, the returned `Vec` would point to freed memory