---

yaml
---
r: 165484
b: refs/heads/master
c: e40a81b
h: refs/heads/master
v: v3

Author: SimonSapin

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: cc33ce6fd07467bca1006823ae7336e84054726c
+refs/heads/master: e40a81b37bf11ae6f7fc3294ac17230eabaaab03
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 658529467d9d69ac9e09cacf98a6d61d781c2c76
 refs/heads/try: aee614fc4973262a5a68efc643026e2b1458d65b

trunk/src/libcollections/string.rs

@@ -512,24 +512,6 @@ impl String {
     #[inline]
     #[stable = "function just renamed from push_char"]
     pub fn push(&mut self, ch: char) {
-        let cur_len = self.len();
-        // This may use up to 4 bytes.
-        self.vec.reserve(4);
-
-        unsafe {
-            // Attempt to not use an intermediate buffer by just pushing bytes
-            // directly onto this string.
-            let slice = RawSlice {
-                data: self.vec.as_ptr().offset(cur_len as int),
-                len: 4,
-            };
-            let used = ch.encode_utf8(mem::transmute(slice)).unwrap_or(0);
-            self.vec.set_len(cur_len + used);
-        }
-    }
-
-    #[inline]
-    fn push_with_ascii_fast_path(&mut self, ch: char) {
         if (ch as u32) < 0x80 {
             self.vec.push(ch as u8);
             return;
@@ -1455,17 +1437,6 @@ mod tests {
         });
     }
 
-    #[bench]
-    fn bench_push_char_one_byte_with_fast_path(b: &mut Bencher) {
-        b.bytes = REPETITIONS;
-        b.iter(|| {
-            let mut r = String::new();
-            for _ in range(0, REPETITIONS) {
-                r.push_with_ascii_fast_path('a')
-            }
-        });
-    }
-
     #[bench]
     fn bench_push_char_two_bytes(b: &mut Bencher) {
         b.bytes = REPETITIONS * 2;
@@ -1477,17 +1448,6 @@ mod tests {
         });
     }
 
-    #[bench]
-    fn bench_push_char_two_bytes_with_slow_path(b: &mut Bencher) {
-        b.bytes = REPETITIONS * 2;
-        b.iter(|| {
-            let mut r = String::new();
-            for _ in range(0, REPETITIONS) {
-                r.push_with_ascii_fast_path('â')
-            }
-        });
-    }
-
     #[bench]
     fn from_utf8_lossy_100_ascii(b: &mut Bencher) {
         let s = b"Hello there, the quick brown fox jumped over the lazy dog! \