---

yaml
---
r: 69205
b: refs/heads/auto
c: 3d6c0bc
h: refs/heads/master
i:
  69203: 41a9de5
v: v3

Author: bors

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 49014c82688a21e1157877280d449e055ce39b6b
+refs/heads/auto: 3d6c0bc05640b9cc62db9fe287903cb709056dcb
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/doc/tutorial.md

@@ -499,8 +499,8 @@ types.
 > items.
 
 ~~~~
-use std::float;
-use std::num::atan;
+# use std::float;
+# use std::num::atan;
 fn angle(vector: (float, float)) -> float {
     let pi = float::consts::pi;
     match vector {
@@ -555,7 +555,7 @@ while cake_amount > 0 {
 `loop` denotes an infinite loop, and is the preferred way of writing `while true`:
 
 ~~~~
-use std::int;
+# use std::int;
 let mut x = 5;
 loop {
     x += x - 3;
@@ -701,7 +701,7 @@ get at their contents. All variant constructors can be used as
 patterns, as in this definition of `area`:
 
 ~~~~
-use std::float;
+# use std::float;
 # struct Point {x: float, y: float}
 # enum Shape { Circle(Point, float), Rectangle(Point, Point) }
 fn area(sh: Shape) -> float {
@@ -733,7 +733,7 @@ fn point_from_direction(dir: Direction) -> Point {
 Enum variants may also be structs. For example:
 
 ~~~~
-use std::float;
+# use std::float;
 # struct Point { x: float, y: float }
 # fn square(x: float) -> float { x * x }
 enum Shape {
@@ -1599,8 +1599,7 @@ lists back to back. Since that is so unsightly, empty argument lists
 may be omitted from `do` expressions.
 
 ~~~~
-use std::task::spawn;
-
+# use std::task::spawn;
 do spawn {
    debug!("Kablam!");
 }
@@ -1729,7 +1728,7 @@ impl Circle {
 To call such a method, just prefix it with the type name and a double colon:
 
 ~~~~
-use std::float::consts::pi;
+# use std::float::consts::pi;
 struct Circle { radius: float }
 impl Circle {
     fn new(area: float) -> Circle { Circle { radius: (area / pi).sqrt() } }
@@ -1775,7 +1774,7 @@ illegal to copy and pass by value.
 Generic `type`, `struct`, and `enum` declarations follow the same pattern:
 
 ~~~~
-use std::hashmap::HashMap;
+# use std::hashmap::HashMap;
 type Set<T> = HashMap<T, ()>;
 
 struct Stack<T> {
@@ -2001,7 +2000,7 @@ name and a double colon.  The compiler uses type inference to decide which
 implementation to use.
 
 ~~~~
-use std::float::consts::pi;
+# use std::float::consts::pi;
 trait Shape { fn new(area: float) -> Self; }
 struct Circle { radius: float }
 struct Square { length: float }
@@ -2157,7 +2156,7 @@ trait Circle : Shape { fn radius(&self) -> float; }
 Now, we can implement `Circle` on a type only if we also implement `Shape`.
 
 ~~~~
-use std::float::consts::pi;
+# use std::float::consts::pi;
 # trait Shape { fn area(&self) -> float; }
 # trait Circle : Shape { fn radius(&self) -> float; }
 # struct Point { x: float, y: float }
@@ -2192,7 +2191,7 @@ fn radius_times_area<T: Circle>(c: T) -> float {
 Likewise, supertrait methods may also be called on trait objects.
 
 ~~~ {.xfail-test}
-use std::float::consts::pi;
+# use std::float::consts::pi;
 # trait Shape { fn area(&self) -> float; }
 # trait Circle : Shape { fn radius(&self) -> float; }
 # struct Point { x: float, y: float }

branches/auto/src/etc/extract-tests.py

@@ -60,9 +60,6 @@
             if not re.search(r"\bextern mod extra\b", block):
                 block = "extern mod extra;\n" + block
             block = """#[ forbid(ctypes) ];
-#[ forbid(deprecated_pattern) ];
-#[ forbid(implicit_copies) ];
-#[ forbid(non_implicitly_copyable_typarams) ];
 #[ forbid(path_statement) ];
 #[ forbid(type_limits) ];
 #[ forbid(unrecognized_lint) ];

branches/auto/src/etc/zsh/_rust

@@ -33,12 +33,9 @@ _rustc_opts_switches=(
 )
 _rustc_opts_lint=(
     'path-statement[path statements with no effect]'
-    'deprecated-pattern[warn about deprecated uses of pattern bindings]'
-    'non-implicitly-copyable-typarams[passing non implicitly copyable types as copy type params]'
     'missing-trait-doc[detects missing documentation for traits]'
     'missing-struct-doc[detects missing documentation for structs]'
     'ctypes[proper use of core::libc types in foreign modules]'
-    'implicit-copies[implicit copies of non implicitly copyable data]'
     "unused-mut[detect mut variables which don't need to be mutable]"
     'unused-imports[imports that are never used]'
     'heap-memory[use of any (~ type or @ type) heap memory]'

branches/auto/src/librustc/middle/lint.rs

@@ -75,9 +75,7 @@ pub enum lint {
     unnecessary_qualification,
     while_true,
     path_statement,
-    implicit_copies,
     unrecognized_lint,
-    deprecated_pattern,
     non_camel_case_types,
     non_uppercase_statics,
     type_limits,
@@ -182,20 +180,6 @@ static lint_table: &'static [(&'static str, LintSpec)] = &[
         default: warn
      }),
 
-    ("implicit_copies",
-     LintSpec {
-        lint: implicit_copies,
-        desc: "implicit copies of non implicitly copyable data",
-        default: warn
-     }),
-
-    ("deprecated_pattern",
-     LintSpec {
-        lint: deprecated_pattern,
-        desc: "warn about deprecated uses of pattern bindings",
-        default: allow
-     }),
-
     ("non_camel_case_types",
      LintSpec {
         lint: non_camel_case_types,

branches/auto/src/librustc/rustc.rs

@@ -17,8 +17,6 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-#[deny(deprecated_pattern)];
-
 extern mod extra;
 extern mod syntax;
 

branches/auto/src/libstd/result.rs

@@ -396,7 +396,6 @@ pub fn unwrap_err<T, U>(res: Result<T, U>) -> U {
 }
 
 #[cfg(test)]
-#[allow(non_implicitly_copyable_typarams)]
 mod tests {
     use result::{Err, Ok, Result, chain, get, get_err};
     use result;

branches/auto/src/libstd/str.rs

@@ -22,7 +22,7 @@ use cast;
 use char;
 use char::Char;
 use clone::Clone;
-use container::Container;
+use container::{Container, Mutable};
 use iter::Times;
 use iterator::{Iterator, IteratorUtil, FilterIterator, AdditiveIterator, MapIterator};
 use libc;
@@ -1214,6 +1214,31 @@ impl<'self> Container for &'self str {
     }
 }
 
+impl Container for ~str {
+    #[inline]
+    fn len(&self) -> uint { self.as_slice().len() }
+    #[inline]
+    fn is_empty(&self) -> bool { self.len() == 0 }
+}
+
+impl Container for @str {
+    #[inline]
+    fn len(&self) -> uint { self.as_slice().len() }
+    #[inline]
+    fn is_empty(&self) -> bool { self.len() == 0 }
+}
+
+impl Mutable for ~str {
+    /// Remove all content, make the string empty
+    #[inline]
+    fn clear(&mut self) {
+        unsafe {
+            raw::set_len(self, 0)
+        }
+    }
+}
+
+
 #[allow(missing_doc)]
 pub trait StrSlice<'self> {
     fn contains<'a>(&self, needle: &'a str) -> bool;
@@ -2502,6 +2527,18 @@ mod tests {
         assert_eq!(~"华ประเทศไทย中", data);
     }
 
+    #[test]
+    fn test_clear() {
+        let mut empty = ~"";
+        empty.clear();
+        assert_eq!("", empty.as_slice());
+        let mut data = ~"ประเทศไทย中";
+        data.clear();
+        assert_eq!("", data.as_slice());
+        data.push_char('华');
+        assert_eq!("华", data.as_slice());
+    }
+
     #[test]
     fn test_split_within() {
         fn t(s: &str, i: uint, u: &[~str]) {
@@ -3494,4 +3531,17 @@ mod tests {
         t::<@str>();
         t::<~str>();
     }
+
+    #[test]
+    fn test_str_container() {
+        fn sum_len<S: Container>(v: &[S]) -> uint {
+            v.iter().transform(|x| x.len()).sum()
+        }
+
+        let s = ~"01234";
+        assert_eq!(5, sum_len(["012", "", "34"]));
+        assert_eq!(5, sum_len([@"01", @"2", @"34", @""]));
+        assert_eq!(5, sum_len([~"01", ~"2", ~"34", ~""]));
+        assert_eq!(5, sum_len([s.as_slice()]));
+    }
 }

branches/auto/src/libstd/tuple.rs

@@ -384,7 +384,6 @@ mod tests {
     }
 
     #[test]
-    #[allow(non_implicitly_copyable_typarams)]
     fn test_tuple() {
         assert_eq!((948, 4039.48).first(), 948);
         assert_eq!((34.5, ~"foo").second(), ~"foo");

branches/auto/src/libsyntax/print/pprust.rs

@@ -457,13 +457,13 @@ pub fn print_foreign_item(s: @ps, item: &ast::foreign_item) {
     match item.node {
       ast::foreign_item_fn(ref decl, purity, ref generics) => {
         print_fn(s, decl, Some(purity), AbiSet::Rust(), item.ident, generics, None,
-                 ast::inherited);
+                 item.vis);
         end(s); // end head-ibox
         word(s.s, ";");
         end(s); // end the outer fn box
       }
       ast::foreign_item_static(ref t, m) => {
-        head(s, "static");
+        head(s, visibility_qualified(item.vis, "static"));
         if m {
             word_space(s, "mut");
         }

branches/auto/src/libsyntax/syntax.rs

@@ -20,8 +20,6 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-#[deny(deprecated_pattern)];
-
 extern mod extra;
 
 pub mod util {

branches/auto/src/test/run-pass-fulldeps/quote-tokens.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[allow(non_implicitly_copyable_typarams)];
-
 extern mod syntax;
 
 use syntax::ext::base::ExtCtxt;

branches/auto/src/test/run-pass/auto-encode.rs

@@ -12,8 +12,6 @@
 
 // xfail-test #6122
 
-#[forbid(deprecated_pattern)];
-
 extern mod extra;
 
 // These tests used to be separate files, but I wanted to refactor all

branches/auto/src/test/run-pass/fixed_length_copy.rs

@@ -8,10 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-// error on implicit copies to check fixed length vectors
-// are implicitly copyable
-#[deny(implicit_copies)]
 pub fn main() {
     let arr = [1,2,3];
     let arr2 = arr;

branches/auto/src/test/run-pass/issue-2550.rs

@@ -21,7 +21,6 @@ fn C(x: uint) -> C {
 fn f<T>(_x: T) {
 }
 
-#[deny(non_implicitly_copyable_typarams)]
 pub fn main() {
     f(C(1u));
 }