---

yaml
---
r: 120200
b: refs/heads/dist-snap
c: 72fc4a5
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 1813e5aa1a03b0596b8de7abd1af31edf5d6098f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: f1735cefcfdee5260ea6961cf785f545a340ff85
+refs/heads/dist-snap: 72fc4a5eb72b8ba96dba66400c7eecac93b0b252
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/doc/tutorial.md

@@ -2385,7 +2385,7 @@ fn print_all<T: Printable>(printable_things: ~[T]) {
 Declaring `T` as conforming to the `Printable` trait (as we earlier
 did with `Clone`) makes it possible to call methods from that trait
 on values of type `T` inside the function. It will also cause a
-compile-time error when anyone tries to call `print_all` on an array
+compile-time error when anyone tries to call `print_all` on a vector
 whose element type does not have a `Printable` implementation.
 
 Type parameters can have multiple bounds by separating them with `+`,
@@ -2428,9 +2428,9 @@ fn draw_all<T: Drawable>(shapes: ~[T]) {
 # draw_all(~[c]);
 ~~~~
 
-You can call that on an array of circles, or an array of rectangles
+You can call that on a vector of circles, or a vector of rectangles
 (assuming those have suitable `Drawable` traits defined), but not on
-an array containing both circles and rectangles. When such behavior is
+a vector containing both circles and rectangles. When such behavior is
 needed, a trait name can alternately be used as a type, called
 an _object_.
 

branches/dist-snap/src/libstd/strbuf.rs

@@ -12,7 +12,7 @@
 
 use c_vec::CVec;
 use char::Char;
-use container::Container;
+use container::{Container, Mutable};
 use fmt;
 use io::Writer;
 use iter::{Extendable, FromIterator, Iterator, range};
@@ -245,6 +245,13 @@ impl Container for StrBuf {
     }
 }
 
+impl Mutable for StrBuf {
+    #[inline]
+    fn clear(&mut self) {
+        self.vec.clear()
+    }
+}
+
 impl FromIterator<char> for StrBuf {
     fn from_iter<I:Iterator<char>>(iterator: I) -> StrBuf {
         let mut buf = StrBuf::new();
@@ -298,6 +305,7 @@ impl<H:Writer> ::hash::Hash<H> for StrBuf {
 #[cfg(test)]
 mod tests {
     extern crate test;
+    use container::{Container, Mutable};
     use self::test::Bencher;
     use str::{Str, StrSlice};
     use super::StrBuf;
@@ -380,4 +388,12 @@ mod tests {
         let mut s = StrBuf::from_str("\u00FC"); // ü
         s.truncate(1);
     }
+
+    #[test]
+    fn test_str_clear() {
+        let mut s = StrBuf::from_str("12345");
+        s.clear();
+        assert_eq!(s.len(), 0);
+        assert_eq!(s.as_slice(), "");
+    }
 }