Register new snapshots
This enables the parser error for `extern mod` => `extern crate` transitions.
This commit is contained in:
parent
3496e93d13
commit
359ac360a4
@ -56,7 +56,7 @@ use container::{Container, Mutable, Map, MutableMap, Set, MutableSet};
|
||||
use clone::Clone;
|
||||
use cmp::{Eq, Equiv, max};
|
||||
use default::Default;
|
||||
#[cfg(not(stage0))] use fmt;
|
||||
use fmt;
|
||||
use hash::Hash;
|
||||
use iter;
|
||||
use iter::{Iterator, FromIterator, Extendable};
|
||||
@ -66,7 +66,7 @@ use num;
|
||||
use option::{None, Option, Some};
|
||||
use rand::Rng;
|
||||
use rand;
|
||||
#[cfg(not(stage0))] use result::{Ok, Err};
|
||||
use result::{Ok, Err};
|
||||
use vec::{ImmutableVector, MutableVector, OwnedVector, Items, MutItems};
|
||||
use vec_ng;
|
||||
use vec_ng::Vec;
|
||||
@ -597,7 +597,6 @@ impl<K:Hash + Eq + Clone,V:Clone> Clone for HashMap<K,V> {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(stage0))]
|
||||
impl<A: fmt::Show + Hash + Eq, B: fmt::Show> fmt::Show for HashMap<A, B> {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
if_ok!(write!(f.buf, r"\{"))
|
||||
@ -876,7 +875,6 @@ impl<T:Hash + Eq + Clone> Clone for HashSet<T> {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(stage0))]
|
||||
impl<A: fmt::Show + Hash + Eq> fmt::Show for HashSet<A> {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
if_ok!(write!(f.buf, r"\{"))
|
||||
|
@ -10,8 +10,6 @@
|
||||
|
||||
//! Runtime environment settings
|
||||
|
||||
// NOTE: remove `POISON_ON_FREE` after a snapshot
|
||||
|
||||
use from_str::from_str;
|
||||
use option::{Some, None};
|
||||
use os;
|
||||
@ -23,7 +21,6 @@ static mut MIN_STACK: uint = 2 * 1024 * 1024;
|
||||
/// This default corresponds to 20M of cache per scheduler (at the default size).
|
||||
static mut MAX_CACHED_STACKS: uint = 10;
|
||||
static mut DEBUG_BORROW: bool = false;
|
||||
static mut POISON_ON_FREE: bool = false;
|
||||
|
||||
pub fn init() {
|
||||
unsafe {
|
||||
@ -43,10 +40,6 @@ pub fn init() {
|
||||
Some(_) => DEBUG_BORROW = true,
|
||||
None => ()
|
||||
}
|
||||
match os::getenv("RUST_POISON_ON_FREE") {
|
||||
Some(_) => POISON_ON_FREE = true,
|
||||
None => ()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -61,7 +54,3 @@ pub fn max_cached_stacks() -> uint {
|
||||
pub fn debug_borrow() -> bool {
|
||||
unsafe { DEBUG_BORROW }
|
||||
}
|
||||
|
||||
pub fn poison_on_free() -> bool {
|
||||
unsafe { POISON_ON_FREE }
|
||||
}
|
||||
|
@ -17,7 +17,6 @@ use ops::Drop;
|
||||
use option::{Option, None, Some};
|
||||
use ptr;
|
||||
use ptr::RawPtr;
|
||||
use rt::env;
|
||||
use rt::global_heap;
|
||||
use rt::local::Local;
|
||||
use rt::task::Task;
|
||||
@ -41,7 +40,6 @@ pub struct MemoryRegion {
|
||||
pub struct LocalHeap {
|
||||
priv memory_region: MemoryRegion,
|
||||
|
||||
priv poison_on_free: bool,
|
||||
priv live_allocs: *mut raw::Box<()>,
|
||||
}
|
||||
|
||||
@ -54,7 +52,6 @@ impl LocalHeap {
|
||||
};
|
||||
LocalHeap {
|
||||
memory_region: region,
|
||||
poison_on_free: env::poison_on_free(),
|
||||
live_allocs: ptr::mut_null(),
|
||||
}
|
||||
}
|
||||
|
@ -108,7 +108,7 @@ use container::{Container, Mutable};
|
||||
use cmp::{Eq, TotalOrd, Ordering, Less, Equal, Greater};
|
||||
use cmp;
|
||||
use default::Default;
|
||||
#[cfg(not(stage0))] use fmt;
|
||||
use fmt;
|
||||
use iter::*;
|
||||
use num::{Integer, CheckedAdd, Saturating, checked_next_power_of_two};
|
||||
use option::{None, Option, Some};
|
||||
@ -116,7 +116,7 @@ use ptr::to_unsafe_ptr;
|
||||
use ptr;
|
||||
use ptr::RawPtr;
|
||||
use rt::global_heap::{malloc_raw, realloc_raw, exchange_free};
|
||||
#[cfg(not(stage0))] use result::{Ok, Err};
|
||||
use result::{Ok, Err};
|
||||
use mem;
|
||||
use mem::size_of;
|
||||
use kinds::marker;
|
||||
@ -2643,7 +2643,6 @@ impl<A: DeepClone> DeepClone for ~[A] {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(stage0))]
|
||||
impl<'a, T: fmt::Show> fmt::Show for &'a [T] {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
if_ok!(write!(f.buf, "["));
|
||||
@ -2660,7 +2659,6 @@ impl<'a, T: fmt::Show> fmt::Show for &'a [T] {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(stage0))]
|
||||
impl<T: fmt::Show> fmt::Show for ~[T] {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
self.as_slice().fmt(f)
|
||||
|
@ -4566,13 +4566,12 @@ impl Parser {
|
||||
let next_is_mod = self.eat_keyword(keywords::Mod);
|
||||
|
||||
if next_is_mod || self.eat_keyword(keywords::Crate) {
|
||||
// NOTE(flaper87): Uncomment this when this changes gets into stage0
|
||||
//
|
||||
// if next_is_mod {
|
||||
// self.span_err(self.span,
|
||||
// format!("`extern mod` is obsolete, use `extern crate` instead \
|
||||
// to refer to external crates."))
|
||||
// }
|
||||
if next_is_mod {
|
||||
self.span_err(self.span,
|
||||
format!("`extern mod` is obsolete, use \
|
||||
`extern crate` instead \
|
||||
to refer to external crates."))
|
||||
}
|
||||
return self.parse_item_extern_crate(lo, visibility, attrs);
|
||||
}
|
||||
|
||||
|
@ -1,3 +1,11 @@
|
||||
S 2014-02-14 18477ac
|
||||
freebsd-x86_64 102df7dfab2a1c59d9e2f16a3f02f368310dd022
|
||||
linux-i386 fcf5891e9b3c7c9ef5ee5ea37e62089346099425
|
||||
linux-x86_64 d7c2df185fd2e25b4b8f5b2caad277b5ba664b81
|
||||
macos-i386
|
||||
macos-x86_64
|
||||
winnt-i386 f78a892f47627f34233e44c2ff4a00b68063a2ce
|
||||
|
||||
S 2014-02-12 c62f6ce
|
||||
freebsd-x86_64 737a423c5f803119ff5a692eac432fa9d0c595a8
|
||||
linux-i386 a7e90e27e8b6a3fa79ddc15f0ed217ccbade875d
|
||||
|
@ -9,11 +9,6 @@
|
||||
// except according to those terms.
|
||||
|
||||
#[crate_id="crateresolve_calories#0.1"];
|
||||
// NOTE: remove after the next snapshot
|
||||
#[link(name = "crateresolve_calories",
|
||||
vers = "0.1",
|
||||
calories = "100")];
|
||||
|
||||
#[crate_type = "lib"];
|
||||
|
||||
pub fn f() -> int { 100 }
|
||||
|
@ -9,11 +9,6 @@
|
||||
// except according to those terms.
|
||||
|
||||
#[crate_id="crateresolve_calories#0.1"];
|
||||
// NOTE: remove after the next snapshot
|
||||
#[link(name = "crateresolve_calories",
|
||||
vers = "0.1",
|
||||
calories = "200")];
|
||||
|
||||
#[crate_type = "lib"];
|
||||
|
||||
pub fn f() -> int { 200 }
|
||||
|
Loading…
x
Reference in New Issue
Block a user