---

yaml
---
r: 79310
b: refs/heads/try
c: 9298af7
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3e6de6b7da8ee88bf84b0e217900051334be08da
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 60fba4d7d677ec098e6a43014132fe99f7547363
-refs/heads/try: 25ed29a0edb3d48fef843a0b818ee68faf2252da
+refs/heads/try: 9298af7e05b5eea00fff5c4dc4b55931a6f7c433
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libstd/vec.rs

@@ -1201,8 +1201,6 @@ pub trait OwnedVector<T> {
     fn shrink_to_fit(&mut self);
 
     fn push(&mut self, t: T);
-    unsafe fn push_fast(&mut self, t: T);
-
     fn push_all_move(&mut self, rhs: ~[T]);
     fn pop(&mut self) -> T;
     fn pop_opt(&mut self) -> Option<T>;
@@ -1334,7 +1332,7 @@ impl<T> OwnedVector<T> for ~[T] {
                     self.reserve_at_least(new_len);
                 }
 
-                self.push_fast(t);
+                push_fast(self, t);
             } else {
                 let repr: **Vec<()> = cast::transmute(&mut *self);
                 let fill = (**repr).fill;
@@ -1343,29 +1341,30 @@ impl<T> OwnedVector<T> for ~[T] {
                     self.reserve_at_least(new_len);
                 }
 
-                self.push_fast(t);
+                push_fast(self, t);
             }
         }
-    }
 
-    // This doesn't bother to make sure we have space.
-    #[inline] // really pretty please
-    unsafe fn push_fast(&mut self, t: T) {
-        if contains_managed::<T>() {
-            let repr: **mut Box<Vec<u8>> = cast::transmute(self);
-            let fill = (**repr).data.fill;
-            (**repr).data.fill += sys::nonzero_size_of::<T>();
-            let p = to_unsafe_ptr(&((**repr).data.data));
-            let p = ptr::offset(p, fill as int) as *mut T;
-            intrinsics::move_val_init(&mut(*p), t);
-        } else {
-            let repr: **mut Vec<u8> = cast::transmute(self);
-            let fill = (**repr).fill;
-            (**repr).fill += sys::nonzero_size_of::<T>();
-            let p = to_unsafe_ptr(&((**repr).data));
-            let p = ptr::offset(p, fill as int) as *mut T;
-            intrinsics::move_val_init(&mut(*p), t);
+        // This doesn't bother to make sure we have space.
+        #[inline] // really pretty please
+        unsafe fn push_fast<T>(this: &mut ~[T], t: T) {
+            if contains_managed::<T>() {
+                let repr: **mut Box<Vec<u8>> = cast::transmute(this);
+                let fill = (**repr).data.fill;
+                (**repr).data.fill += sys::nonzero_size_of::<T>();
+                let p = to_unsafe_ptr(&((**repr).data.data));
+                let p = ptr::offset(p, fill as int) as *mut T;
+                intrinsics::move_val_init(&mut(*p), t);
+            } else {
+                let repr: **mut Vec<u8> = cast::transmute(this);
+                let fill = (**repr).fill;
+                (**repr).fill += sys::nonzero_size_of::<T>();
+                let p = to_unsafe_ptr(&((**repr).data));
+                let p = ptr::offset(p, fill as int) as *mut T;
+                intrinsics::move_val_init(&mut(*p), t);
+            }
         }
+
     }
 
     /// Takes ownership of the vector `rhs`, moving all elements into