auto merge of #15556 : alexcrichton/rust/snapshots, r=brson

Closes #15544
rust-lang · Jul 10, 2014 · 898701c · 898701c
2 parents 1852069 + 0c71e0c
commit 898701c
Show file tree

Hide file tree

Showing 44 changed files with 13 additions and 242 deletions.
diff --git a/mk/target.mk b/mk/target.mk
@@ -68,15 +68,6 @@ $(foreach host,$(CFG_HOST),						    \
 # $(4) is the crate name
 define RUST_TARGET_STAGE_N
 
-# NOTE: after a stage0 snap this should be just EXTRA_FILENAME, not with a stage
-# or target bound
-EXTRA_FILENAME_$(1)_$(2) = -C extra-filename=-$$(CFG_FILENAME_EXTRA)
-ifeq ($(1),0)
-ifeq ($$(CFG_BUILD),$(2))
-EXTRA_FILENAME_$(1)_$(2) =
-endif
-endif
-
 $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): CFG_COMPILER_HOST_TRIPLE = $(2)
 $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4):				    \
 		$$(CRATEFILE_$(4))				    \
@@ -95,7 +86,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4):				    \
 		-L "$$(dir $$(LLVM_STDCPP_LOCATION_$(2)))" \
 		$$(RUSTFLAGS_$(4)) \
 		--out-dir $$(@D) \
-		$$(EXTRA_FILENAME_$(1)_$(2)) \
+		-C extra-filename=-$$(CFG_FILENAME_EXTRA) \
 		$$<
 	@touch $$@
 	$$(call LIST_ALL_OLD_GLOB_MATCHES,\

diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
@@ -60,7 +60,6 @@
 //! by libc malloc/free.  The `libc_heap` module is defined to be wired up to
 //! the system malloc/free.
 
-#![crate_id = "alloc#0.11.0"] // NOTE: remove after a stage0 snap
 #![crate_name = "alloc"]
 #![experimental]
 #![license = "MIT/ASL2"]
@@ -71,7 +70,6 @@
 
 #![no_std]
 #![feature(lang_items, phase, unsafe_destructor)]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 
 #[phase(plugin, link)]
 extern crate core;

diff --git a/src/libarena/lib.rs b/src/libarena/lib.rs
@@ -19,7 +19,6 @@
 //! arena but can only hold objects of a single type, and Arena, which is a
 //! more complex, slower Arena which can hold objects of any type.
 
-#![crate_id = "arena#0.11.0"]
 #![crate_name = "arena"]
 #![experimental]
 #![crate_type = "rlib"]
@@ -31,7 +30,6 @@
 
 #![feature(unsafe_destructor)]
 #![allow(missing_doc)]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 
 use std::cell::{Cell, RefCell};
 use std::cmp;

diff --git a/src/libcollections/bitv.rs b/src/libcollections/bitv.rs
@@ -16,20 +16,16 @@ use core::cmp;
 use core::default::Default;
 use core::fmt;
 use core::iter::Take;
+use core::ops::Index;
 use core::slice;
 use core::uint;
 use std::hash;
 
 use {Collection, Mutable, Set, MutableSet};
 use vec::Vec;
 
-#[cfg(not(stage0))]
-use core::ops::Index;
 
-#[cfg(not(stage0))]
 static TRUE: bool = true;
-
-#[cfg(not(stage0))]
 static FALSE: bool = false;
 
 #[deriving(Clone)]
@@ -80,7 +76,6 @@ pub struct Bitv {
     nbits: uint
 }
 
-#[cfg(not(stage0))]
 impl Index<uint,bool> for Bitv {
     #[inline]
     fn index<'a>(&'a self, i: &uint) -> &'a bool {

diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs
@@ -12,7 +12,6 @@
  * Collection types.
  */
 
-#![crate_id = "collections#0.11.0"] // NOTE: remove after stage0
 #![crate_name = "collections"]
 #![experimental]
 #![crate_type = "rlib"]
@@ -25,7 +24,6 @@
 #![feature(macro_rules, managed_boxes, default_type_params, phase, globs)]
 #![feature(unsafe_destructor)]
 #![no_std]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 
 #[phase(plugin, link)] extern crate core;
 extern crate unicode;

diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
@@ -47,7 +47,6 @@
 // Since libcore defines many fundamental lang items, all tests live in a
 // separate crate, libcoretest, to avoid bizarre issues.
 
-#![crate_id = "core#0.11.0"]
 #![crate_name = "core"]
 #![experimental]
 #![license = "MIT/ASL2"]
@@ -61,7 +60,6 @@
 #![feature(globs, intrinsics, lang_items, macro_rules, managed_boxes, phase)]
 #![feature(simd, unsafe_destructor)]
 #![deny(missing_doc)]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 
 mod macros;
 

diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs
@@ -636,7 +636,6 @@ shr_impl!(uint u8 u16 u32 u64 int i8 i16 i32 i64)
  * ```
  */
 #[lang="index"]
-#[cfg(not(stage0))]
 pub trait Index<Index,Result> {
     /// The method for the indexing (`Foo[Bar]`) operation
     fn index<'a>(&'a self, index: &Index) -> &'a Result;
@@ -668,7 +667,6 @@ pub trait Index<Index,Result> {
  * ```
  */
 #[lang="index_mut"]
-#[cfg(not(stage0))]
 pub trait IndexMut<Index,Result> {
     /// The method for the indexing (`Foo[Bar]`) operation
     fn index_mut<'a>(&'a mut self, index: &Index) -> &'a mut Result;

diff --git a/src/libcore/prelude.rs b/src/libcore/prelude.rs
@@ -34,7 +34,6 @@ pub use ops::{Add, Sub, Mul, Div, Rem, Neg, Not};
 pub use ops::{BitAnd, BitOr, BitXor};
 pub use ops::{Drop, Deref, DerefMut};
 pub use ops::{Shl, Shr};
-#[cfg(not(stage0))]
 pub use ops::{Index, IndexMut};
 pub use option::{Option, Some, None};
 pub use result::{Result, Ok, Err};

diff --git a/src/libdebug/lib.rs b/src/libdebug/lib.rs
@@ -16,7 +16,6 @@
 //! Additionally, it is not guaranteed that functionality such as reflection
 //! will persist into the future.
 
-#![crate_id = "debug#0.11.0"] // NOTE: remove after stage0
 #![crate_name = "debug"]
 #![experimental]
 #![license = "MIT/ASL2"]
@@ -28,7 +27,6 @@
 #![experimental]
 #![feature(managed_boxes, macro_rules)]
 #![allow(experimental)]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 
 pub mod fmt;
 pub mod reflect;

diff --git a/src/libflate/lib.rs b/src/libflate/lib.rs
@@ -18,7 +18,6 @@ Simple [DEFLATE][def]-based compression. This is a wrapper around the
 
 */
 
-#![crate_id = "flate#0.11.0"] // NOTE: remove after stage0
 #![crate_name = "flate"]
 #![experimental]
 #![crate_type = "rlib"]
@@ -28,7 +27,6 @@ Simple [DEFLATE][def]-based compression. This is a wrapper around the
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
        html_root_url = "http://doc.rust-lang.org/0.11.0/")]
 #![feature(phase)]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 
 #[cfg(test)] #[phase(plugin, link)] extern crate log;
 

diff --git a/src/libfmt_macros/lib.rs b/src/libfmt_macros/lib.rs
@@ -14,14 +14,12 @@
 //! Parsing does not happen at runtime: structures of `std::fmt::rt` are
 //! generated instead.
 
-#![crate_id = "fmt_macros#0.11.0"] // NOTE: remove after stage0c
 #![crate_name = "fmt_macros"]
 #![experimental]
 #![license = "MIT/ASL2"]
 #![crate_type = "rlib"]
 #![crate_type = "dylib"]
 #![feature(macro_rules, globs)]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 
 use std::char;
 use std::str;

diff --git a/src/libfourcc/lib.rs b/src/libfourcc/lib.rs
@@ -39,7 +39,6 @@ fn main() {
 
 */
 
-#![crate_id = "fourcc#0.11.0"] // NOTE: remove after stage0
 #![crate_name = "fourcc"]
 #![experimental]
 #![crate_type = "rlib"]
@@ -48,7 +47,6 @@ fn main() {
 #![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://doc.rust-lang.org/0.11.0/")]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 
 #![feature(plugin_registrar, managed_boxes)]
 

diff --git a/src/libgetopts/lib.rs b/src/libgetopts/lib.rs
@@ -76,7 +76,6 @@
 //! }
 //! ~~~
 
-#![crate_id = "getopts#0.11.0"] // NOTE: remove after stage0
 #![crate_name = "getopts"]
 #![experimental]
 #![crate_type = "rlib"]
@@ -88,7 +87,6 @@
        html_playground_url = "http://play.rust-lang.org/")]
 #![feature(globs, phase)]
 #![deny(missing_doc)]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 
 #[cfg(test)] extern crate debug;
 #[cfg(test)] #[phase(plugin, link)] extern crate log;

diff --git a/src/libglob/lib.rs b/src/libglob/lib.rs
@@ -23,7 +23,6 @@
  * `glob`/`fnmatch` functions.
  */
 
-#![crate_id = "glob#0.11.0"] // NOTE: remove after stage0
 #![crate_name = "glob"]
 #![experimental]
 #![crate_type = "rlib"]
@@ -33,7 +32,6 @@
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
        html_root_url = "http://doc.rust-lang.org/0.11.0/",
        html_playground_url = "http://play.rust-lang.org/")]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 
 use std::cell::Cell;
 use std::{cmp, os, path};

diff --git a/src/libgraphviz/lib.rs b/src/libgraphviz/lib.rs
@@ -266,7 +266,6 @@ pub fn main() {
 
 */
 
-#![crate_id = "graphviz#0.11.0"] // NOTE: remove after stage0
 #![crate_name = "graphviz"]
 #![experimental]
 #![crate_type = "rlib"]
@@ -275,7 +274,6 @@ pub fn main() {
 #![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://doc.rust-lang.org/0.11.0/")]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 
 use std::io;
 use std::str;

diff --git a/src/libgreen/lib.rs b/src/libgreen/lib.rs
@@ -197,7 +197,6 @@
 //! pool.shutdown();
 //! ```
 
-#![crate_id = "green#0.11.0"] // NOTE: remove after stage0
 #![crate_name = "green"]
 #![experimental]
 #![license = "MIT/ASL2"]
@@ -211,7 +210,6 @@
 // NB this does *not* include globs, please keep it that way.
 #![feature(macro_rules, phase, default_type_params)]
 #![allow(visible_private_types, deprecated)]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 
 #[cfg(test)] #[phase(plugin, link)] extern crate log;
 #[cfg(test)] extern crate rustuv;

diff --git a/src/libhexfloat/lib.rs b/src/libhexfloat/lib.rs
@@ -36,7 +36,6 @@ fn main() {
 
 */
 
-#![crate_id = "hexfloat#0.11.0"] // NOTE: remove after stage0
 #![crate_name = "hexfloat"]
 #![experimental]
 #![crate_type = "rlib"]
@@ -46,7 +45,6 @@ fn main() {
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
        html_root_url = "http://doc.rust-lang.org/0.11.0/")]
 #![feature(plugin_registrar, managed_boxes)]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 
 extern crate syntax;
 extern crate rustc;

diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #![feature(globs)]
-#![crate_id = "libc#0.11.0"] // NOTE: remove after a stage0 snap
 #![crate_name = "libc"]
 #![experimental]
 #![no_std] // we don't need std, and we can't have std, since it doesn't exist
@@ -19,7 +18,6 @@
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
        html_root_url = "http://doc.rust-lang.org/0.11.0/",
        html_playground_url = "http://play.rust-lang.org/")]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 
 /*!
 * Bindings for the C standard library and other platform libraries

diff --git a/src/liblog/lib.rs b/src/liblog/lib.rs
@@ -105,7 +105,6 @@ if logging is disabled, none of the components of the log will be executed.
 
 */
 
-#![crate_id = "log#0.11.0"] // NOTE: Remove after stage0
 #![crate_name = "log"]
 #![experimental]
 #![license = "MIT/ASL2"]
@@ -115,7 +114,6 @@ if logging is disabled, none of the components of the log will be executed.
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
        html_root_url = "http://doc.rust-lang.org/0.11.0/",
        html_playground_url = "http://play.rust-lang.org/")]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 #![feature(macro_rules)]
 #![deny(missing_doc)]
 

diff --git a/src/libnative/lib.rs b/src/libnative/lib.rs
@@ -46,7 +46,6 @@
 //! }
 //! ```
 
-#![crate_id = "native#0.11.0"] // NOTE: remove after stage0
 #![crate_name = "native"]
 #![experimental]
 #![license = "MIT/ASL2"]
@@ -58,7 +57,6 @@
 
 #![deny(unused_result, unused_must_use)]
 #![allow(non_camel_case_types, deprecated)]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 #![feature(default_type_params, lang_items)]
 
 // NB this crate explicitly does *not* allow glob imports, please seriously

diff --git a/src/libnum/lib.rs b/src/libnum/lib.rs
@@ -44,7 +44,6 @@
 
 #![feature(macro_rules)]
 
-#![crate_id = "num#0.11.0"] // NOTE: remove after stage0
 #![crate_name = "num"]
 #![experimental]
 #![crate_type = "rlib"]
@@ -54,7 +53,6 @@
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
        html_root_url = "http://doc.rust-lang.org/0.11.0/",
        html_playground_url = "http://play.rust-lang.org/")]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 #![allow(deprecated)] // from_str_radix
 
 extern crate rand;

diff --git a/src/librand/lib.rs b/src/librand/lib.rs
@@ -16,7 +16,6 @@
 //! is not recommended to use this library directly, but rather the official
 //! interface through `std::rand`.
 
-#![crate_id = "rand#0.11.0"] // NOTE: remove after a stage0 snap
 #![crate_name = "rand"]
 #![license = "MIT/ASL2"]
 #![crate_type = "rlib"]
@@ -26,7 +25,6 @@
        html_playground_url = "http://play.rust-lang.org/")]
 
 #![feature(macro_rules, phase, globs)]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 #![no_std]
 #![experimental]
 

diff --git a/src/libregex/lib.rs b/src/libregex/lib.rs
@@ -356,7 +356,6 @@
 //! characters in the search text and `m` is the number of instructions in a
 //! compiled expression.
 
-#![crate_id = "regex#0.11.0"] // NOTE: remove after stage0
 #![crate_name = "regex"]
 #![crate_type = "rlib"]
 #![crate_type = "dylib"]
@@ -368,7 +367,6 @@
        html_playground_url = "http://play.rust-lang.org/")]
 
 #![feature(macro_rules, phase)]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 #![deny(missing_doc)]
 
 #[cfg(test)]

diff --git a/src/libregex_macros/lib.rs b/src/libregex_macros/lib.rs
@@ -11,15 +11,13 @@
 //! This crate provides the `regex!` macro. Its use is documented in the
 //! `regex` crate.
 
-#![crate_id = "regex_macros#0.11.0"] // NOTE: remove after stage0
 #![crate_name = "regex_macros"]
 #![crate_type = "dylib"]
 #![experimental]
 #![license = "MIT/ASL2"]
 #![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://doc.rust-lang.org/0.11.0/")]
-#![allow(unused_attribute)] // NOTE: remove after stage0
 
 #![feature(plugin_registrar, managed_boxes, quote)]