Skip to content

Register new snapshots #13026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 20, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/libcollections/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/libgetopts/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions src/libnative/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/librand/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions src/librustc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 0 additions & 7 deletions src/librustc/middle/ty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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) }
Expand Down
38 changes: 0 additions & 38 deletions src/librustc/util/nodemap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
7 changes: 1 addition & 6 deletions src/libserialize/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
8 changes: 1 addition & 7 deletions src/libstd/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 0 additions & 16 deletions src/libstd/ops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
62 changes: 0 additions & 62 deletions src/libstd/rt/crate_map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down Expand Up @@ -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);
}
10 changes: 2 additions & 8 deletions src/libstd/rt/libunwind.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
3 changes: 1 addition & 2 deletions src/libstd/rt/thread.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
}
Expand Down
1 change: 1 addition & 0 deletions src/libsync/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions src/libsyntax/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions src/libterm/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/libtime/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 8 additions & 0 deletions src/snapshots.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down