auto merge of #13026 : alexcrichton/rust/snapshots, r=huonw

bors · bors · commit 7334c11b4b19 · 2014-03-20T11:06:42.000-07:00
diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs
@@ -21,10 +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)]; // NOTE: remove after stage0
 
 extern crate rand;
 
diff --git a/src/libgetopts/lib.rs b/src/libgetopts/lib.rs
@@ -83,9 +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)];
-
 #[feature(globs, phase)];
+#[deny(missing_doc)];
+#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 
 #[cfg(test)] #[phase(syntax, link)] extern crate log;
 
diff --git a/src/libnative/lib.rs b/src/libnative/lib.rs
@@ -50,6 +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)]; // 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
diff --git a/src/librand/lib.rs b/src/librand/lib.rs
@@ -71,6 +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)]; // NOTE: remove after stage0
 
 #[cfg(test)]
 #[phase(syntax, link)] extern crate log;
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
@@ -28,8 +28,9 @@ This API is completely unstable and subject to change.
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
 #[allow(deprecated)];
-#[feature(macro_rules, globs, struct_variant, managed_boxes)];
-#[feature(quote, default_type_params, phase)];
+#[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;
diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs
@@ -178,13 +178,6 @@ impl cmp::Eq for intern_key {
     }
 }
 
-#[cfg(stage0)]
-impl Hash for intern_key {
-    fn hash(&self, s: &mut sip::SipState) {
-        unsafe { (*self.sty).hash(s) }
-    }
-}
-#[cfg(not(stage0))]
 impl<W:Writer> Hash<W> for intern_key {
     fn hash(&self, s: &mut W) {
         unsafe { (*self.sty).hash(s) }
diff --git a/src/librustc/util/nodemap.rs b/src/librustc/util/nodemap.rs
@@ -15,19 +15,15 @@ use std::hash::{Hasher, Hash};
 use std::io;
 use syntax::ast;
 
-#[cfg(not(stage0))]
 pub type FnvHashMap<K, V> = HashMap<K, V, FnvHasher>;
 
 pub type NodeMap<T> = FnvHashMap<ast::NodeId, T>;
 pub type DefIdMap<T> = FnvHashMap<ast::DefId, T>;
 
-#[cfg(not(stage0))]
 pub type NodeSet = HashSet<ast::NodeId, FnvHasher>;
-#[cfg(not(stage0))]
 pub type DefIdSet = HashSet<ast::DefId, FnvHasher>;
 
 // Hacks to get good names
-#[cfg(not(stage0))]
 pub mod FnvHashMap {
     use std::hash::Hash;
     use collections::HashMap;
@@ -45,53 +41,19 @@ pub mod DefIdMap {
         super::FnvHashMap::new()
     }
 }
-#[cfg(not(stage0))]
 pub mod NodeSet {
     use collections::HashSet;
     pub fn new() -> super::NodeSet {
         HashSet::with_hasher(super::FnvHasher)
     }
 }
-#[cfg(not(stage0))]
 pub mod DefIdSet {
     use collections::HashSet;
     pub fn new() -> super::DefIdSet {
         HashSet::with_hasher(super::FnvHasher)
     }
 }
 
-#[cfg(stage0)]
-pub type FnvHashMap<K, V> = HashMap<K, V>;
-
-#[cfg(stage0)]
-pub type NodeSet = HashSet<ast::NodeId>;
-#[cfg(stage0)]
-pub type DefIdSet = HashSet<ast::DefId>;
-
-// Hacks to get good names
-#[cfg(stage0)]
-pub mod FnvHashMap {
-    use std::hash::Hash;
-    use collections::HashMap;
-    pub fn new<K: Hash + Eq, V>() -> super::FnvHashMap<K, V> {
-        HashMap::new()
-    }
-}
-#[cfg(stage0)]
-pub mod NodeSet {
-    use collections::HashSet;
-    pub fn new() -> super::NodeSet {
-        HashSet::new()
-    }
-}
-#[cfg(stage0)]
-pub mod DefIdSet {
-    use collections::HashSet;
-    pub fn new() -> super::DefIdSet {
-        HashSet::new()
-    }
-}
-
 /// A speedy hash algorithm for node ids and def ids. The hashmap in
 /// libcollections by default uses SipHash which isn't quite as speedy as we
 /// want. In the compiler we're not really worried about DOS attempts, so we
diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs
@@ -21,13 +21,8 @@ Core encoding and decoding interfaces.
 #[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(missing_doc)];
-#[forbid(non_camel_case_types)];
 #[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)]; // NOTE: remove after stage0
 
 // test harness access
 #[cfg(test)]
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
@@ -51,20 +51,14 @@
 #[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")];
-
 #[feature(macro_rules, globs, asm, managed_boxes, thread_local, link_args,
           simd, linkage, default_type_params, phase)];
 
-// NOTE remove the following two attributes after the next snapshot.
-#[allow(unrecognized_lint)];
-#[allow(default_type_param_usage)];
-
 // Don't link to std. We are std.
 #[no_std];
 
-#[deny(non_camel_case_types)];
 #[deny(missing_doc)];
-#[allow(unknown_features)];
+#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 
 // When testing libstd, bring in libuv as the I/O backend so tests can print
 // things and all of the std::io tests have an I/O interface to run on top
diff --git a/src/libstd/ops.rs b/src/libstd/ops.rs
@@ -475,13 +475,6 @@ pub trait Index<Index,Result> {
     fn index(&self, index: &Index) -> Result;
 }
 
-/// Dummy dox
-#[cfg(stage0)]
-pub trait Deref<Result> {
-    /// dummy dox
-    fn deref<'a>(&'a self) -> &'a Result;
-}
-
 /**
  *
  * The `Deref` trait is used to specify the functionality of dereferencing
@@ -509,20 +502,12 @@ pub trait Deref<Result> {
  * }
  * ```
  */
-#[cfg(not(stage0))]
 #[lang="deref"]
 pub trait Deref<Result> {
     /// The method called to dereference a value
     fn deref<'a>(&'a self) -> &'a Result;
 }
 
-/// dummy dox
-#[cfg(stage0)]
-pub trait DerefMut<Result>: Deref<Result> {
-    /// dummy dox
-    fn deref_mut<'a>(&'a mut self) -> &'a mut Result;
-}
-
 /**
  *
  * The `DerefMut` trait is used to specify the functionality of dereferencing
@@ -557,7 +542,6 @@ pub trait DerefMut<Result>: Deref<Result> {
  * }
  * ```
  */
-#[cfg(not(stage0))]
 #[lang="deref_mut"]
 pub trait DerefMut<Result>: Deref<Result> {
     /// The method called to mutably dereference a value
diff --git a/src/libstd/rt/crate_map.rs b/src/libstd/rt/crate_map.rs
@@ -13,32 +13,13 @@ use option::{Some, None, Option};
 use ptr::RawPtr;
 use rt::rtio::EventLoop;
 
-#[cfg(stage0)] use cmp::TotalOrd;
-#[cfg(stage0)] use container::MutableSet;
-#[cfg(stage0)] use iter::Iterator;
-#[cfg(stage0)] use slice::{ImmutableVector, OwnedVector};
-
 // Need to tell the linker on OS X to not barf on undefined symbols
 // and instead look them up at runtime, which we need to resolve
 // the crate_map properly.
 #[cfg(target_os = "macos")]
 #[link_args = "-Wl,-U,__rust_crate_map_toplevel"]
 extern {}
 
-#[cfg(stage0)]
-pub struct ModEntry<'a> {
-    name: &'a str,
-    log_level: *mut u32
-}
-
-#[cfg(stage0)]
-pub struct CrateMap<'a> {
-    version: i32,
-    entries: &'a [ModEntry<'a>],
-    children: &'a [&'a CrateMap<'a>],
-    event_loop_factory: Option<fn() -> ~EventLoop>,
-}
-#[cfg(not(stage0))]
 pub struct CrateMap<'a> {
     version: i32,
     event_loop_factory: Option<fn() -> ~EventLoop>,
@@ -121,46 +102,3 @@ pub fn get_crate_map() -> Option<&'static CrateMap<'static>> {
         }
     }
 }
-
-#[cfg(stage0)]
-fn version(crate_map: &CrateMap) -> i32 {
-    match crate_map.version {
-        2 => return 2,
-        _ => return 0
-    }
-}
-
-#[cfg(stage0)]
-fn do_iter_crate_map<'a>(
-                     crate_map: &'a CrateMap<'a>,
-                     f: |&'a ModEntry<'a>|,
-                     visited: &mut ~[*CrateMap<'a>]) {
-    let raw = crate_map as *CrateMap<'a>;
-    if visited.bsearch(|a| (*a as uint).cmp(&(raw as uint))).is_some() {
-        return
-    }
-    match visited.iter().position(|i| *i as uint > raw as uint) {
-        Some(i) => visited.insert(i, raw),
-        None => visited.push(raw),
-    }
-
-    match version(crate_map) {
-        2 => {
-            let (entries, children) = (crate_map.entries, crate_map.children);
-            for entry in entries.iter() {
-                f(entry);
-            }
-            for child in children.iter() {
-                do_iter_crate_map(*child, |x| f(x), visited);
-            }
-        },
-        _ => fail!("invalid crate map version")
-    }
-}
-
-/// Iterates recursively over `crate_map` and all child crate maps
-#[cfg(stage0)]
-pub fn iter_crate_map<'a>(crate_map: &'a CrateMap<'a>, f: |&'a ModEntry<'a>|) {
-    let mut v = ~[];
-    do_iter_crate_map(crate_map, f, &mut v);
-}
diff --git a/src/libstd/rt/libunwind.rs b/src/libstd/rt/libunwind.rs
@@ -101,17 +101,11 @@ extern "C" {
     pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn,
                              trace_argument: *libc::c_void)
                 -> _Unwind_Reason_Code;
-    #[cfg(stage0, not(target_os = "android"))]
-    pub fn _Unwind_GetIP(ctx: *_Unwind_Context) -> libc::uintptr_t;
-    #[cfg(stage0, not(target_os = "android"))]
-    pub fn _Unwind_FindEnclosingFunction(pc: *libc::c_void) -> *libc::c_void;
 
-    #[cfg(not(stage0),
-          not(target_os = "android"),
+    #[cfg(not(target_os = "android"),
           not(target_os = "linux", target_arch = "arm"))]
     pub fn _Unwind_GetIP(ctx: *_Unwind_Context) -> libc::uintptr_t;
-    #[cfg(not(stage0),
-          not(target_os = "android"),
+    #[cfg(not(target_os = "android"),
           not(target_os = "linux", target_arch = "arm"))]
     pub fn _Unwind_FindEnclosingFunction(pc: *libc::c_void) -> *libc::c_void;
 }
diff --git a/src/libstd/rt/thread.rs b/src/libstd/rt/thread.rs
@@ -271,7 +271,7 @@ mod imp {
     // Assumes that we've been dynamically linked to libpthread but that is
     // currently always the case.  Note that you need to check that the symbol
     // is non-null before calling it!
-    #[cfg(target_os = "linux", not(stage0))]
+    #[cfg(target_os = "linux")]
     fn min_stack_size(attr: *libc::pthread_attr_t) -> libc::size_t {
         use ptr::RawPtr;
         type F = extern "C" unsafe fn(*libc::pthread_attr_t) -> libc::size_t;
@@ -289,7 +289,6 @@ mod imp {
     // __pthread_get_minstack() is marked as weak but extern_weak linkage is
     // not supported on OS X, hence this kludge...
     #[cfg(not(target_os = "linux"))]
-    #[cfg(stage0)]
     fn min_stack_size(_: *libc::pthread_attr_t) -> libc::size_t {
         PTHREAD_STACK_MIN
     }
diff --git a/src/libsync/lib.rs b/src/libsync/lib.rs
@@ -20,6 +20,7 @@
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 #[feature(phase)];
+#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 
 #[cfg(test)] #[phase(syntax, link)] extern crate log;
 
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
@@ -26,10 +26,10 @@ This API is completely unstable and subject to change.
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
-#[feature(macro_rules, globs, managed_boxes, default_type_params, phase, quote)];
-
+#[feature(macro_rules, globs, managed_boxes, default_type_params, phase,
+          quote)];
+#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 #[allow(deprecated)];
-#[deny(non_camel_case_types)];
 
 extern crate serialize;
 extern crate term;
diff --git a/src/libterm/lib.rs b/src/libterm/lib.rs
@@ -20,8 +20,7 @@
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
 #[feature(macro_rules)];
-#[deny(non_camel_case_types)];
-#[allow(missing_doc)];
+#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 
 extern crate collections;
 
diff --git a/src/libtime/lib.rs b/src/libtime/lib.rs
@@ -15,8 +15,8 @@
 #[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")];
-
 #[feature(phase)];
+#[allow(deprecated_owned_vector)]; // NOTE: remove after stage0
 
 #[cfg(test)] #[phase(syntax, link)] extern crate log;
 extern crate serialize;
diff --git a/src/snapshots.txt b/src/snapshots.txt
@@ -1,3 +1,11 @@
+S 2014-03-19 4ca51ae
+  freebsd-x86_64 3059005ca4ee2972bb705313bfb7848e859a20cd
+  linux-i386 8907cd4ce8b8301d70a6bbc0100c955444270c19
+  linux-x86_64 54df3ad0c9f0db585090ab98692956cfbd7a3bd8
+  macos-i386 b4b3ff9d658e6fa5b2441f0f315941119fe091a8
+  macos-x86_64 0e67338c4395ef22231b63fa8139d85f277a8edd
+  winnt-i386 d39f2c0b53a914c1b60a99d0e32892e3fb511273
+
 S 2014-03-03 6e7f170
   freebsd-x86_64 1afdfbb838af95cea5d5037018f220356da954f6
   linux-i386 edd73d291614907ad502a9f726cd9facb1f2f49f

Original file line number	Diff line number	Diff line change
`@@ -178,13 +178,6 @@ impl cmp::Eq for intern_key {`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
`181`		`-#[cfg(stage0)]`
`182`		`-impl Hash for intern_key {`
`183`		`- fn hash(&self, s: &mut sip::SipState) {`
`184`		`- unsafe { (*self.sty).hash(s) }`
`185`		`- }`
`186`		`-}`
`187`		`-#[cfg(not(stage0))]`
`188`	`181`	`impl<W:Writer> Hash<W> for intern_key {`
`189`	`182`	`fn hash(&self, s: &mut W) {`
`190`	`183`	`unsafe { (*self.sty).hash(s) }`