From 11ac4df4d2402188f96fa75b3c9b7962e9bac805 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 19 Mar 2014 23:04:25 -0700 Subject: [PATCH] Register new snapshots --- src/libcollections/lib.rs | 5 +-- src/libgetopts/lib.rs | 4 +-- src/libnative/lib.rs | 1 + src/librand/lib.rs | 1 + src/librustc/lib.rs | 5 +-- src/librustc/middle/ty.rs | 7 ---- src/librustc/util/nodemap.rs | 38 ---------------------- src/libserialize/lib.rs | 7 +--- src/libstd/lib.rs | 8 +---- src/libstd/ops.rs | 16 ---------- src/libstd/rt/crate_map.rs | 62 ------------------------------------ src/libstd/rt/libunwind.rs | 10 ++---- src/libstd/rt/thread.rs | 3 +- src/libsync/lib.rs | 1 + src/libsyntax/lib.rs | 6 ++-- src/libterm/lib.rs | 3 +- src/libtime/lib.rs | 2 +- src/snapshots.txt | 8 +++++ 18 files changed, 27 insertions(+), 160 deletions(-) diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs index f92aee98479..ec57173ff19 100644 --- 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 index f4937755484..d176f974056 100644 --- 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 index 4b6942a1083..f50cf727864 100644 --- 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 index 357363597d9..1d0070ea477 100644 --- a/src/librand/lib.rs +++ b/src/librand/lib.rs @@ -71,6 +71,7 @@ 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 index b0def333cb3..57ef81b1bc5 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -28,8 +28,9 @@ 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 index a153aa48219..86cb4e9b010 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -178,13 +178,6 @@ fn ne(&self, other: &intern_key) -> bool { } } -#[cfg(stage0)] -impl Hash for intern_key { - fn hash(&self, s: &mut sip::SipState) { - unsafe { (*self.sty).hash(s) } - } -} -#[cfg(not(stage0))] impl Hash 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 index 7507fd579eb..bbe3192999a 100644 --- a/src/librustc/util/nodemap.rs +++ b/src/librustc/util/nodemap.rs @@ -15,19 +15,15 @@ use std::io; use syntax::ast; -#[cfg(not(stage0))] pub type FnvHashMap = HashMap; pub type NodeMap = FnvHashMap; pub type DefIdMap = FnvHashMap; -#[cfg(not(stage0))] pub type NodeSet = HashSet; -#[cfg(not(stage0))] pub type DefIdSet = HashSet; // Hacks to get good names -#[cfg(not(stage0))] pub mod FnvHashMap { use std::hash::Hash; use collections::HashMap; @@ -45,14 +41,12 @@ pub fn new() -> super::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 { @@ -60,38 +54,6 @@ pub fn new() -> super::DefIdSet { } } -#[cfg(stage0)] -pub type FnvHashMap = HashMap; - -#[cfg(stage0)] -pub type NodeSet = HashSet; -#[cfg(stage0)] -pub type DefIdSet = HashSet; - -// Hacks to get good names -#[cfg(stage0)] -pub mod FnvHashMap { - use std::hash::Hash; - use collections::HashMap; - pub fn new() -> super::FnvHashMap { - 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 index 3d4a7cd909a..ad2e741f782 100644 --- a/src/libserialize/lib.rs +++ b/src/libserialize/lib.rs @@ -21,13 +21,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")]; -#[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 index 583510a7e80..433400cc9f0 100644 --- 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 index 849e2a79e08..75928e2921e 100644 --- a/src/libstd/ops.rs +++ b/src/libstd/ops.rs @@ -475,13 +475,6 @@ pub trait Index { fn index(&self, index: &Index) -> Result; } -/// Dummy dox -#[cfg(stage0)] -pub trait Deref { - /// 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 { * } * ``` */ -#[cfg(not(stage0))] #[lang="deref"] pub trait Deref { /// The method called to dereference a value fn deref<'a>(&'a self) -> &'a Result; } -/// dummy dox -#[cfg(stage0)] -pub trait DerefMut: Deref { - /// 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: Deref { * } * ``` */ -#[cfg(not(stage0))] #[lang="deref_mut"] pub trait DerefMut: Deref { /// The method called to mutably dereference a value diff --git a/src/libstd/rt/crate_map.rs b/src/libstd/rt/crate_map.rs index 52cced26254..98f4986b2c7 100644 --- a/src/libstd/rt/crate_map.rs +++ b/src/libstd/rt/crate_map.rs @@ -13,11 +13,6 @@ 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. @@ -25,20 +20,6 @@ #[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 ~EventLoop>, -} -#[cfg(not(stage0))] pub struct CrateMap<'a> { version: i32, event_loop_factory: Option ~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 index 2528a22be9a..fabfa2c8a7a 100644 --- a/src/libstd/rt/libunwind.rs +++ b/src/libstd/rt/libunwind.rs @@ -101,17 +101,11 @@ pub fn _Unwind_RaiseException(exception: *_Unwind_Exception) 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 index e27698d7dd0..0cbd67557de 100644 --- a/src/libstd/rt/thread.rs +++ b/src/libstd/rt/thread.rs @@ -271,7 +271,7 @@ pub unsafe fn detach(native: rust_thread) { // 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 @@ fn min_stack_size(attr: *libc::pthread_attr_t) -> libc::size_t { // __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 index 70874a029ac..5e97b92e738 100644 --- 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 index 73ff9e147e8..cea531ee3b3 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -26,10 +26,10 @@ 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 index 411b0558573..3584d2bd162 100644 --- 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 index 183d86059ac..2e4773fea24 100644 --- 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 index 0238a007d1a..77c1cc68b17 100644 --- 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 -- 2.44.0