Test fixes and rebase conflicts from rollup

src/libcollections/vec.rs

@@ -231,7 +231,7 @@ impl<T> Vec<T> {
     ///         }
     ///
     ///         // Put everything back together into a Vec
-    ///         let rebuilt = Vec::from_raw_parts(len, cap, p);
+    ///         let rebuilt = Vec::from_raw_parts(p, len, cap);
     ///         assert_eq!(rebuilt, vec![4i, 5i, 6i]);
     ///     }
     /// }

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

src/test/compile-fail/issue-17458.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 static X: uint = 0 as *const uint as uint;
+//~^ ERROR: can not cast a pointer to an integer in a constant expression
 
 fn main() {
     assert_eq!(X, 0);

src/test/run-pass/issue-16668.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-pretty
+
 #![feature(unboxed_closures)]
 
 struct Parser<'a, I, O> {