---

yaml
---
r: 151604
b: refs/heads/try2
c: cb115ac
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: b8e3f3a41715a7de7e32eb32456aa25132c8ff46
+refs/heads/try2: cb115ac2d4f57d8b590c8d46d8f9e2958ed9a527
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/strbuf.rs

@@ -19,8 +19,9 @@ use iter::{Extendable, FromIterator, Iterator, range};
 use mem;
 use option::{None, Option, Some};
 use ptr::RawPtr;
+use ptr;
 use slice::{OwnedVector, Vector, CloneableVector};
-use str::{OwnedStr, Str, StrSlice, StrAllocating};
+use str::{CharRange, OwnedStr, Str, StrSlice, StrAllocating};
 use str;
 use vec::Vec;
 
@@ -215,19 +216,49 @@ impl StrBuf {
         Some(byte)
     }
 
+    /// Removes the last character from the string buffer and returns it. Returns `None` if this
+    /// string buffer is empty.
+    #[inline]
+    pub fn pop_char(&mut self) -> Option<char> {
+        let len = self.len();
+        if len == 0 {
+            return None
+        }
+
+        let CharRange {ch, next} = self.as_slice().char_range_at_reverse(len);
+        unsafe {
+            self.vec.set_len(next);
+        }
+        Some(ch)
+    }
+
     /// Removes the first byte from the string buffer and returns it. Returns `None` if this string
     /// buffer is empty.
     ///
     /// The caller must preserve the valid UTF-8 property.
     pub unsafe fn shift_byte(&mut self) -> Option<u8> {
+        self.vec.shift()
+    }
+
+    /// Removes the first character from the string buffer and returns it. Returns `None` if this
+    /// string buffer is empty.
+    ///
+    /// # Warning
+    ///
+    /// This is a O(n) operation as it requires copying every element in the buffer.
+    pub fn shift_char (&mut self) -> Option<char> {
         let len = self.len();
         if len == 0 {
             return None
         }
 
-        let byte = self.as_slice()[0];
-        *self = self.as_slice().slice(1, len).into_strbuf();
-        Some(byte)
+        let CharRange {ch, next} = self.as_slice().char_range_at(0);
+        let new_len = len - next;
+        unsafe {
+            ptr::copy_memory(self.vec.as_mut_ptr(), self.vec.as_ptr().offset(next as int), new_len);
+            self.vec.set_len(new_len);
+        }
+        Some(ch)
     }
 
     /// Views the string buffer as a mutable sequence of bytes.
@@ -357,6 +388,28 @@ mod tests {
         assert_eq!(data.as_slice(), "ประเทศไทย中华b¢€𤭢");
     }
 
+    #[test]
+    fn test_pop_char() {
+        let mut data = StrBuf::from_str("ประเทศไทย中华b¢€𤭢");
+        assert_eq!(data.pop_char().unwrap(), '𤭢'); // 4 bytes
+        assert_eq!(data.pop_char().unwrap(), '€'); // 3 bytes
+        assert_eq!(data.pop_char().unwrap(), '¢'); // 2 bytes
+        assert_eq!(data.pop_char().unwrap(), 'b'); // 1 bytes
+        assert_eq!(data.pop_char().unwrap(), '华');
+        assert_eq!(data.as_slice(), "ประเทศไทย中");
+    }
+
+    #[test]
+    fn test_shift_char() {
+        let mut data = StrBuf::from_str("𤭢€¢b华ประเทศไทย中");
+        assert_eq!(data.shift_char().unwrap(), '𤭢'); // 4 bytes
+        assert_eq!(data.shift_char().unwrap(), '€'); // 3 bytes
+        assert_eq!(data.shift_char().unwrap(), '¢'); // 2 bytes
+        assert_eq!(data.shift_char().unwrap(), 'b'); // 1 bytes
+        assert_eq!(data.shift_char().unwrap(), '华');
+        assert_eq!(data.as_slice(), "ประเทศไทย中");
+    }
+
     #[test]
     fn test_str_truncate() {
         let mut s = StrBuf::from_str("12345");