---

yaml
---
r: 109215
b: refs/heads/dist-snap
c: caf17fe
h: refs/heads/master
i:
  109213: b30360b
  109211: f6c7f7e
  109207: 3faa014
  109199: 7e81b45
  109183: 997990b
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: 3c4edff9b58eb7dd689779fdab6f980f0860dd98
+refs/heads/dist-snap: caf17fea06bdf3d1540aded41a161f04a8c5a2c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -12,8 +12,8 @@
 #[feature(phase)];
 
 #[allow(non_camel_case_types)];
+#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 #[deny(warnings)];
-#[allow(deprecated_owned_vector)];
 
 extern crate test;
 extern crate getopts;

branches/dist-snap/src/doc/guide-unsafe.md

@@ -595,10 +595,10 @@ Other features provided by lang items include:
 - stack unwinding and general failure; the `eh_personality`, `fail_`
   and `fail_bounds_checks` lang items.
 - the traits in `std::kinds` used to indicate types that satisfy
-  various kinds; lang items `send`, `freeze` and `pod`.
+  various kinds; lang items `send`, `share` and `pod`.
 - the marker types and variance indicators found in
   `std::kinds::markers`; lang items `covariant_type`,
-  `contravariant_lifetime`, `no_freeze_bound`, etc.
+  `contravariant_lifetime`, `no_share_bound`, etc.
 
 Lang items are loaded lazily by the compiler; e.g. if one never uses
 `~` then there is no need to define functions for `exchange_malloc`

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

@@ -2033,7 +2033,7 @@ Supported traits for `deriving` are:
 
 * Comparison traits: `Eq`, `TotalEq`, `Ord`, `TotalOrd`.
 * Serialization: `Encodable`, `Decodable`. These require `serialize`.
-* `Clone` and `DeepClone`, to perform (deep) copies.
+* `Clone`, to create `T` from `&T` via a copy.
 * `Hash`, to iterate over the bytes in a data type.
 * `Rand`, to create a random instance of a data type.
 * `Default`, to create an empty instance of a data type.

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

@@ -2095,6 +2095,10 @@ and may not be overridden:
 Types are sendable
 unless they contain managed boxes, managed closures, or references.
 
+* `Share` - Types that are *threadsafe*
+These are types that are safe to be used across several threads with access to
+a `&T` pointer. `MutexArc` is an example of a *sharable* type with internal mutable data.
+
 * `Freeze` - Constant (immutable) types.
 These are types that do not contain anything intrinsically mutable.
 Intrinsically mutable values include `Cell` in the standard library.
@@ -2534,7 +2538,7 @@ enum ABC { A, B, C }
 ~~~
 
 The full list of derivable traits is `Eq`, `TotalEq`, `Ord`,
-`TotalOrd`, `Encodable` `Decodable`, `Clone`, `DeepClone`,
+`TotalOrd`, `Encodable` `Decodable`, `Clone`,
 `Hash`, `Rand`, `Default`, `Zero`, `FromPrimitive` and `Show`.
 
 # Crates and the module system

branches/dist-snap/src/etc/generate-deriving-span-tests.py

@@ -116,7 +116,7 @@ def write_file(name, string):
 }
 
 for (trait, supers, errs) in [('Rand', [], 1),
-                              ('Clone', [], 1), ('DeepClone', ['Clone'], 1),
+                              ('Clone', [], 1),
                               ('Eq', [], 2), ('Ord', [], 8),
                               ('TotalEq', [], 1), ('TotalOrd', ['TotalEq'], 1),
                               ('Show', [], 1),

branches/dist-snap/src/etc/vim/syntax/rust.vim

@@ -72,7 +72,7 @@ syn keyword rustTrait Any AnyOwnExt AnyRefExt AnyMutRefExt
 syn keyword rustTrait Ascii AsciiCast OwnedAsciiCast AsciiStr IntoBytes
 syn keyword rustTrait ToCStr
 syn keyword rustTrait Char
-syn keyword rustTrait Clone DeepClone
+syn keyword rustTrait Clone
 syn keyword rustTrait Eq Ord TotalEq TotalOrd Ordering Equiv
 syn keyword rustEnumVariant Less Equal Greater
 syn keyword rustTrait Container Mutable Map MutableMap Set MutableSet

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

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

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

@@ -1575,7 +1575,7 @@ mod test_map {
     use super::HashMap;
     use std::iter::{Iterator,range_inclusive,range_step_inclusive};
     use std::local_data;
-    use std::vec_ng;
+    use std::vec;
 
     #[test]
     fn test_create_capacity_zero() {
@@ -1599,7 +1599,7 @@ mod test_map {
         assert_eq!(*m.find(&2).unwrap(), 4);
     }
 
-    local_data_key!(drop_vector: vec_ng::Vec<int>)
+    local_data_key!(drop_vector: vec::Vec<int>)
 
     #[deriving(Hash, Eq)]
     struct Dropable {
@@ -1625,7 +1625,7 @@ mod test_map {
 
     #[test]
     fn test_drops() {
-        local_data::set(drop_vector, vec_ng::Vec::from_elem(200, 0));
+        local_data::set(drop_vector, vec::Vec::from_elem(200, 0));
 
         {
             let mut m = HashMap::new();

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

@@ -21,11 +21,7 @@
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
 #[feature(macro_rules, managed_boxes, default_type_params, phase)];
-
-// NOTE remove the following two attributes after the next snapshot.
-#[allow(unrecognized_lint)];
-#[allow(default_type_param_usage)];
-#[allow(deprecated_owned_vector)];
+#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 
 extern crate rand;
 

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

@@ -94,7 +94,6 @@ pub fn inflate_bytes_zlib(bytes: &[u8]) -> CVec<u8> {
 
 #[cfg(test)]
 mod tests {
-    #[allow(deprecated_owned_vector)];
     extern crate rand;
 
     use super::{inflate_bytes, deflate_bytes};

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

@@ -83,10 +83,9 @@
 #[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
-#[deny(missing_doc)];
-#[allow(deprecated_owned_vector)];
-
 #[feature(globs, phase)];
+#[deny(missing_doc)];
+#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 
 #[cfg(test)] #[phase(syntax, link)] extern crate log;
 

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

@@ -30,7 +30,6 @@
 #[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
-#[allow(deprecated_owned_vector)];
 
 use std::cell::Cell;
 use std::{cmp, os, path};

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

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

branches/dist-snap/src/liblog/directive.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 use std::cmp;
-use std::vec_ng::Vec;
 
 #[deriving(Show, Clone)]
 pub struct LogDirective {

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

@@ -126,7 +126,6 @@ use std::local_data;
 use std::os;
 use std::rt;
 use std::slice;
-use std::vec_ng::Vec;
 
 use sync::one::{Once, ONCE_INIT};
 

branches/dist-snap/src/libnative/io/file_unix.rs

@@ -19,7 +19,6 @@ use std::libc;
 use std::mem;
 use std::rt::rtio;
 use std::slice;
-use std::vec_ng::Vec;
 
 use io::{IoResult, retry, keep_going};
 

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

@@ -50,7 +50,7 @@
       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)];
+#[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/libnum/bigint.rs

@@ -28,8 +28,7 @@ use rand::Rng;
 use std::str;
 use std::uint;
 use std::{i64, u64};
-use std::vec_ng;
-use std::vec_ng::Vec;
+use std::vec;
 
 /**
 A `BigDigit` is a `BigUint`'s composing element.
@@ -753,7 +752,7 @@ impl BigUint {
     fn shl_unit(&self, n_unit: uint) -> BigUint {
         if n_unit == 0 || self.is_zero() { return (*self).clone(); }
 
-        return BigUint::new(vec_ng::append(Vec::from_elem(n_unit, ZERO_BIG_DIGIT),
+        return BigUint::new(vec::append(Vec::from_elem(n_unit, ZERO_BIG_DIGIT),
                                            self.data.as_slice()));
     }
 
@@ -1461,7 +1460,6 @@ mod biguint_tests {
     use std::num::CheckedDiv;
     use rand::{task_rng};
     use std::u64;
-    use std::vec_ng::Vec;
 
     #[test]
     fn test_from_slice() {
@@ -2195,7 +2193,6 @@ mod bigint_tests {
     use std::num::{ToPrimitive, FromPrimitive};
     use rand::{task_rng};
     use std::u64;
-    use std::vec_ng::Vec;
 
     #[test]
     fn test_from_biguint() {

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

@@ -17,7 +17,6 @@
 #[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
-#[allow(deprecated_owned_vector)];
 
 extern crate rand;
 

branches/dist-snap/src/libnum/rational.rs

@@ -16,7 +16,6 @@ use std::cmp;
 use std::fmt;
 use std::from_str::FromStr;
 use std::num::{Zero,One,ToStrRadix,FromStrRadix,Round};
-use std::vec_ng::Vec;
 use bigint::{BigInt, BigUint, Sign, Plus, Minus};
 
 /// Represents the ratio between 2 numbers.

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

@@ -71,7 +71,7 @@ println!("{:?}", tuple_ptr)
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
 #[feature(macro_rules, managed_boxes, phase)];
-#[allow(deprecated_owned_vector)];
+#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 
 #[cfg(test)]
 #[phase(syntax, link)] extern crate log;

branches/dist-snap/src/librustc/back/archive.rs

@@ -16,7 +16,6 @@ use metadata::filesearch;
 use lib::llvm::{ArchiveRef, llvm};
 
 use std::cast;
-use std::vec_ng::Vec;
 use std::io;
 use std::io::{fs, TempDir};
 use std::libc;

branches/dist-snap/src/librustc/back/link.rs

@@ -33,7 +33,6 @@ use std::ptr;
 use std::str;
 use std::io;
 use std::io::{fs, TempDir, Process};
-use std::vec_ng::Vec;
 use flate;
 use serialize::hex::ToHex;
 use syntax::abi;
@@ -105,7 +104,6 @@ pub mod write {
     use std::io::Process;
     use std::libc::{c_uint, c_int};
     use std::str;
-    use std::vec_ng::Vec;
 
     // On android, we by default compile for armv7 processors. This enables
     // things like double word CAS instructions (rather than emulating them)

branches/dist-snap/src/librustc/back/mips.rs

@@ -11,7 +11,6 @@
 use back::target_strs;
 use driver::session::sess_os_to_meta_os;
 use metadata::loader::meta_section_name;
-use std::vec_ng::Vec;
 use syntax::abi;
 
 pub fn get_target_strs(target_triple: ~str, target_os: abi::Os) -> target_strs::t {

branches/dist-snap/src/librustc/back/rpath.rs

@@ -15,7 +15,6 @@ use metadata::filesearch;
 
 use collections::HashSet;
 use std::{os, slice};
-use std::vec_ng::Vec;
 use syntax::abi;
 
 fn not_win32(os: abi::Os) -> bool {

branches/dist-snap/src/librustc/back/target_strs.rs

@@ -10,8 +10,6 @@
 
 #[allow(non_camel_case_types)];
 
-use std::vec_ng::Vec;
-
 pub struct t {
     module_asm: ~str,
     meta_sect_name: ~str,

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

@@ -37,8 +37,7 @@ use std::io::fs;
 use std::io::MemReader;
 use std::mem::drop;
 use std::os;
-use std::vec_ng::Vec;
-use std::vec_ng;
+use std::vec;
 use getopts::{optopt, optmulti, optflag, optflagopt};
 use getopts;
 use syntax::ast;
@@ -138,7 +137,7 @@ pub fn build_configuration(sess: &Session) -> ast::CrateConfig {
     } else {
         InternedString::new("nogc")
     });
-    return vec_ng::append(user_cfg.move_iter().collect(),
+    return vec::append(user_cfg.move_iter().collect(),
                           default_cfg.as_slice());
 }
 
@@ -835,7 +834,7 @@ pub fn build_session_options(matches: &getopts::Matches) -> session::Options {
 
         let level_short = level_name.slice_chars(0, 1);
         let level_short = level_short.to_ascii().to_upper().into_str();
-        let flags = vec_ng::append(matches.opt_strs(level_short)
+        let flags = vec::append(matches.opt_strs(level_short)
                                           .move_iter()
                                           .collect(),
                                    matches.opt_strs(level_name));

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

@@ -28,7 +28,6 @@ use syntax::{abi, ast, codemap};
 use syntax;
 
 use std::cell::{Cell, RefCell};
-use std::vec_ng::Vec;
 use collections::HashSet;
 
 pub struct Config {
@@ -407,7 +406,7 @@ macro_rules! cgoptions(
             }
         }
 
-        fn parse_list(slot: &mut ::std::vec_ng::Vec<~str>, v: Option<&str>)
+        fn parse_list(slot: &mut Vec<~str>, v: Option<&str>)
                       -> bool {
             match v {
                 Some(s) => {

branches/dist-snap/src/librustc/front/config.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::vec_ng::Vec;
 use syntax::fold::Folder;
 use syntax::{ast, fold, attr};
 use syntax::codemap;

branches/dist-snap/src/librustc/front/feature_gate.rs

@@ -31,7 +31,6 @@ use syntax::parse::token;
 use driver::session::Session;
 
 use std::cell::Cell;
-use std::vec_ng::Vec;
 
 /// This is a list of all known features since the beginning of time. This list
 /// can never shrink, it may only be expanded (in order to prevent old programs

branches/dist-snap/src/librustc/front/std_inject.rs

@@ -11,8 +11,7 @@
 
 use driver::session::Session;
 
-use std::vec_ng::Vec;
-use std::vec_ng;
+use std::vec;
 use syntax::ast;
 use syntax::attr;
 use syntax::codemap::DUMMY_SP;
@@ -182,7 +181,7 @@ impl<'a> fold::Folder for PreludeInjector<'a> {
             span: DUMMY_SP,
         };
 
-        let vis = vec_ng::append(vec!(vi2), module.view_items.as_slice());
+        let vis = vec::append(vec!(vi2), module.view_items.as_slice());
 
         // FIXME #2543: Bad copy.
         let new_module = ast::Mod {