---

yaml
---
r: 109295
b: refs/heads/dist-snap
c: 903e838
h: refs/heads/master
i:
  109293: 7ec0323
  109291: 093cc4c
  109287: 0444508
  109279: b78dddc
v: v3

Author: bors

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: f6db0ef9464a17fa6e547e755b1b5dfa09af9499
+refs/heads/dist-snap: 903e83889ade166bf62f1ee74df8bf8331ea17d1
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/compiletest/runtest.rs

@@ -452,7 +452,7 @@ fn run_debuginfo_test(config: &config, props: &TestProps, testfile: &Path) {
         let options_to_remove = [~"-O", ~"-g", ~"--debuginfo"];
         let new_options = split_maybe_args(options).move_iter()
                                                    .filter(|x| !options_to_remove.contains(x))
-                                                   .to_owned_vec()
+                                                   .collect::<~[~str]>()
                                                    .connect(" ");
         Some(new_options)
     }

branches/dist-snap/src/driver/driver.rs

@@ -8,10 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[no_uv]; // remove this after stage0
-#[allow(attribute_usage)]; // remove this after stage0
-extern crate native; // remove this after stage0
-
 #[cfg(rustdoc)]
 extern crate this = "rustdoc";
 

branches/dist-snap/src/libarena/lib.rs

@@ -24,7 +24,6 @@
       html_root_url = "http://static.rust-lang.org/doc/master")];
 #[allow(missing_doc)];
 #[feature(managed_boxes)];
-#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 
 extern crate collections;
 

branches/dist-snap/src/libcollections/lib.rs

@@ -21,7 +21,6 @@
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
 #[feature(macro_rules, managed_boxes, default_type_params, phase)];
-#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 
 extern crate rand;
 

branches/dist-snap/src/libglob/lib.rs

@@ -223,7 +223,7 @@ impl Pattern {
      */
     pub fn new(pattern: &str) -> Pattern {
 
-        let chars = pattern.chars().to_owned_vec();
+        let chars = pattern.chars().collect::<~[_]>();
         let mut tokens = Vec::new();
         let mut i = 0;
 

branches/dist-snap/src/libgreen/lib.rs

@@ -174,7 +174,6 @@
 // NB this does *not* include globs, please keep it that way.
 #[feature(macro_rules, phase)];
 #[allow(visible_private_types)];
-#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 
 #[cfg(test)] #[phase(syntax, link)] extern crate log;
 extern crate rand;

branches/dist-snap/src/libnative/lib.rs

@@ -50,7 +50,6 @@
       html_root_url = "http://static.rust-lang.org/doc/master")];
 #[deny(unused_result, unused_must_use)];
 #[allow(non_camel_case_types)];
-#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 
 // NB this crate explicitly does *not* allow glob imports, please seriously
 //    consider whether they're needed before adding that feature here (the

branches/dist-snap/src/librand/lib.rs

@@ -71,7 +71,6 @@ println!("{:?}", tuple_ptr)
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
 #[feature(macro_rules, managed_boxes, phase)];
-#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 
 #[cfg(test)]
 #[phase(syntax, link)] extern crate log;
@@ -826,7 +825,7 @@ mod test {
         let max_val = 100;
 
         let mut r = task_rng();
-        let vals = range(min_val, max_val).to_owned_vec();
+        let vals = range(min_val, max_val).collect::<~[int]>();
         let small_sample = r.sample(vals.iter(), 5);
         let large_sample = r.sample(vals.iter(), vals.len() + 5);
 

branches/dist-snap/src/librustc/lib.rs

@@ -30,7 +30,6 @@ This API is completely unstable and subject to change.
 #[allow(deprecated)];
 #[feature(macro_rules, globs, struct_variant, managed_boxes, quote,
           default_type_params, phase)];
-#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 
 extern crate flate;
 extern crate arena;

branches/dist-snap/src/librustc/metadata/creader.rs

@@ -197,7 +197,7 @@ fn visit_item(e: &Env, i: &ast::Item) {
                 } else {
                     None
                 })
-                .to_owned_vec();
+                .collect::<~[&ast::Attribute]>();
             for m in link_args.iter() {
                 match m.value_str() {
                     Some(linkarg) => e.sess.cstore.add_used_link_args(linkarg.get()),
@@ -212,7 +212,7 @@ fn visit_item(e: &Env, i: &ast::Item) {
                 } else {
                     None
                 })
-                .to_owned_vec();
+                .collect::<~[&ast::Attribute]>();
             for m in link_args.iter() {
                 match m.meta_item_list() {
                     Some(items) => {

branches/dist-snap/src/librustc/middle/trans/base.rs

@@ -236,7 +236,7 @@ fn get_extern_rust_fn(ccx: &CrateContext, inputs: &[ty::t], output: ty::t,
 
     let f = decl_rust_fn(ccx, false, inputs, output, name);
     csearch::get_item_attrs(&ccx.sess().cstore, did, |meta_items| {
-        set_llvm_fn_attrs(meta_items.iter().map(|&x| attr::mk_attr(x)).to_owned_vec(), f)
+        set_llvm_fn_attrs(meta_items.iter().map(|&x| attr::mk_attr(x)).collect::<~[_]>(), f)
     });
 
     ccx.externs.borrow_mut().insert(name.to_owned(), f);

branches/dist-snap/src/librustc/middle/trans/consts.rs

@@ -538,7 +538,7 @@ fn const_expr_unadjusted(cx: &CrateContext, e: &ast::Expr,
               };
 
               expr::with_field_tys(tcx, ety, Some(e.id), |discr, field_tys| {
-                  let cs = field_tys.iter().enumerate()
+                  let (cs, inlineable) = slice::unzip(field_tys.iter().enumerate()
                       .map(|(ix, &field_ty)| {
                       match fs.iter().find(|f| field_ty.ident.name == f.ident.node.name) {
                           Some(f) => const_expr(cx, (*f).expr, is_local),
@@ -552,8 +552,7 @@ fn const_expr_unadjusted(cx: &CrateContext, e: &ast::Expr,
                               }
                           }
                       }
-                  }).to_owned_vec();
-                  let (cs, inlineable) = slice::unzip(cs.move_iter());
+                  }));
                   (adt::trans_const(cx, repr, discr, cs),
                    inlineable.iter().fold(true, |a, &b| a && b))
               })

branches/dist-snap/src/librustdoc/html/markdown.rs

@@ -133,7 +133,7 @@ pub fn render(w: &mut io::Writer, s: &str, print_toc: bool) -> fmt::Result {
             slice::raw::buf_as_slice((*text).data, (*text).size as uint, |text| {
                 let text = str::from_utf8(text).unwrap();
                 let mut lines = text.lines().filter(|l| stripped_filtered_line(*l).is_none());
-                let text = lines.to_owned_vec().connect("\n");
+                let text = lines.collect::<~[&str]>().connect("\n");
 
                 let buf = buf {
                     data: text.as_bytes().as_ptr(),
@@ -186,7 +186,7 @@ pub fn render(w: &mut io::Writer, s: &str, print_toc: bool) -> fmt::Result {
                 Some(s) => s.to_lower().into_str(),
                 None => s.to_owned()
             }
-        }).to_owned_vec().connect("-");
+        }).collect::<~[~str]>().connect("-");
 
         let opaque = unsafe {&mut *(opaque as *mut my_opaque)};
 
@@ -284,7 +284,7 @@ pub fn find_testable_code(doc: &str, tests: &mut ::test::Collector) {
                 let tests = &mut *(opaque as *mut ::test::Collector);
                 let text = str::from_utf8(text).unwrap();
                 let mut lines = text.lines().map(|l| stripped_filtered_line(l).unwrap_or(l));
-                let text = lines.to_owned_vec().connect("\n");
+                let text = lines.collect::<~[&str]>().connect("\n");
                 tests.add_test(text, should_fail, no_run);
             })
         }

branches/dist-snap/src/librustdoc/html/render.rs

@@ -1205,8 +1205,8 @@ fn item_trait(w: &mut Writer, it: &clean::Item,
                   it.name.get_ref().as_slice(),
                   t.generics,
                   parents));
-    let required = t.methods.iter().filter(|m| m.is_req()).to_owned_vec();
-    let provided = t.methods.iter().filter(|m| !m.is_req()).to_owned_vec();
+    let required = t.methods.iter().filter(|m| m.is_req()).collect::<~[&clean::TraitMethod]>();
+    let provided = t.methods.iter().filter(|m| !m.is_req()).collect::<~[&clean::TraitMethod]>();
 
     if t.methods.len() == 0 {
         try!(write!(w, "\\{ \\}"));
@@ -1502,11 +1502,11 @@ fn render_methods(w: &mut Writer, it: &clean::Item) -> fmt::Result {
                 let mut non_trait = v.iter().filter(|p| {
                     p.ref0().trait_.is_none()
                 });
-                let non_trait = non_trait.to_owned_vec();
+                let non_trait = non_trait.collect::<~[&(clean::Impl, Option<~str>)]>();
                 let mut traits = v.iter().filter(|p| {
                     p.ref0().trait_.is_some()
                 });
-                let traits = traits.to_owned_vec();
+                let traits = traits.collect::<~[&(clean::Impl, Option<~str>)]>();
 
                 if non_trait.len() > 0 {
                     try!(write!(w, "<h2 id='methods'>Methods</h2>"));

branches/dist-snap/src/librustuv/lib.rs

@@ -42,7 +42,6 @@ via `close` and `delete` methods.
 #[feature(macro_rules)];
 #[deny(unused_result, unused_must_use)];
 #[allow(visible_private_types)];
-#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 
 #[cfg(test)] extern crate green;
 #[cfg(test)] extern crate realrustuv = "rustuv";

branches/dist-snap/src/libserialize/lib.rs

@@ -22,7 +22,6 @@ Core encoding and decoding interfaces.
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 #[feature(macro_rules, managed_boxes, default_type_params, phase)];
-#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 
 // test harness access
 #[cfg(test)]

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

@@ -400,7 +400,7 @@ unsafe fn str_map_bytes(string: ~str, map: &'static [u8]) -> ~str {
 
 #[inline]
 unsafe fn str_copy_map_bytes(string: &str, map: &'static [u8]) -> ~str {
-    let bytes = string.bytes().map(|b| map[b]).to_owned_vec();
+    let bytes = string.bytes().map(|b| map[b]).collect::<~[_]>();
 
     str::raw::from_utf8_owned(bytes)
 }

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

@@ -164,90 +164,7 @@ pub trait TyVisitor {
     fn visit_self(&mut self) -> bool;
 }
 
-#[cfg(stage0)]
-extern "rust-intrinsic" {
-    pub fn atomic_cxchg<T>(dst: &mut T, old: T, src: T) -> T;
-    pub fn atomic_cxchg_acq<T>(dst: &mut T, old: T, src: T) -> T;
-    pub fn atomic_cxchg_rel<T>(dst: &mut T, old: T, src: T) -> T;
-    pub fn atomic_cxchg_acqrel<T>(dst: &mut T, old: T, src: T) -> T;
-    pub fn atomic_cxchg_relaxed<T>(dst: &mut T, old: T, src: T) -> T;
-
-    pub fn atomic_load<T>(src: &T) -> T;
-    pub fn atomic_load_acq<T>(src: &T) -> T;
-    pub fn atomic_load_relaxed<T>(src: &T) -> T;
-
-    pub fn atomic_store<T>(dst: &mut T, val: T);
-    pub fn atomic_store_rel<T>(dst: &mut T, val: T);
-    pub fn atomic_store_relaxed<T>(dst: &mut T, val: T);
-
-    pub fn atomic_xchg<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_xchg_acq<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_xchg_rel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_xchg_acqrel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_xchg_relaxed<T>(dst: &mut T, src: T) -> T;
-
-    pub fn atomic_xadd<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_xadd_acq<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_xadd_rel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_xadd_acqrel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_xadd_relaxed<T>(dst: &mut T, src: T) -> T;
-
-    pub fn atomic_xsub<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_xsub_acq<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_xsub_rel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_xsub_acqrel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_xsub_relaxed<T>(dst: &mut T, src: T) -> T;
-
-    pub fn atomic_and<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_and_acq<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_and_rel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_and_acqrel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_and_relaxed<T>(dst: &mut T, src: T) -> T;
-
-    pub fn atomic_nand<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_nand_acq<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_nand_rel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_nand_acqrel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_nand_relaxed<T>(dst: &mut T, src: T) -> T;
-
-    pub fn atomic_or<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_or_acq<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_or_rel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_or_acqrel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_or_relaxed<T>(dst: &mut T, src: T) -> T;
-
-    pub fn atomic_xor<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_xor_acq<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_xor_rel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_xor_acqrel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_xor_relaxed<T>(dst: &mut T, src: T) -> T;
-
-    pub fn atomic_max<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_max_acq<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_max_rel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_max_acqrel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_max_relaxed<T>(dst: &mut T, src: T) -> T;
-
-    pub fn atomic_min<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_min_acq<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_min_rel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_min_acqrel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_min_relaxed<T>(dst: &mut T, src: T) -> T;
-
-    pub fn atomic_umin<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_umin_acq<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_umin_rel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_umin_acqrel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_umin_relaxed<T>(dst: &mut T, src: T) -> T;
-
-    pub fn atomic_umax<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_umax_acq<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_umax_rel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_umax_acqrel<T>(dst: &mut T, src: T) -> T;
-    pub fn atomic_umax_relaxed<T>(dst: &mut T, src: T) -> T;
-}
 
-#[cfg(not(stage0))]
 extern "rust-intrinsic" {
 
     // NB: These intrinsics take unsafe pointers because they mutate aliased