diff --git a/mk/target.mk b/mk/target.mk index 1bdbf53af7e..e6fb22e8c42 100644 --- 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 index 3e403d122ac..80b6cee2a9d 100644 --- 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 index 51eacd3fb4e..0118828ae18 100644 --- 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 index 23be65cc4e2..226da13f9e2 100644 --- a/src/libcollections/bitv.rs +++ b/src/libcollections/bitv.rs @@ -16,6 +16,7 @@ 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; @@ -23,13 +24,8 @@ 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 for Bitv { #[inline] fn index<'a>(&'a self, i: &uint) -> &'a bool { diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs index 74a9953403d..cce2d14efa9 100644 --- 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 index d27cf760690..6d76f7c36e8 100644 --- 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 index fc37fdde8f5..53179df4cb9 100644 --- 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 { /// The method for the indexing (`Foo[Bar]`) operation fn index<'a>(&'a self, index: &Index) -> &'a Result; @@ -668,7 +667,6 @@ pub trait Index { * ``` */ #[lang="index_mut"] -#[cfg(not(stage0))] pub trait IndexMut { /// 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 index f967a2a5fa5..d8ab89fd504 100644 --- 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 index e5424fccbed..1d15c62e752 100644 --- 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 index 923aab5e032..b9d61ab3868 100644 --- 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 index c32f27adf65..62547b6669f 100644 --- 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 index 55e55ba7e51..b490f090302 100644 --- 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 index 23f16be1659..cf879c5d7ef 100644 --- 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 index 668000b2db4..637ceb00ce6 100644 --- 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 index 662722e08d9..e5c2cdb4365 100644 --- 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 index 357644aed03..3574f415815 100644 --- 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 index 17c71c6365e..57c187b5c64 100644 --- 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 index e0dd57f6ae9..16e452fdcf9 100644 --- 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 index 33d1cc87b73..c4c18ab6d39 100644 --- 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 index 85813a7dde3..f9a6ef3a963 100644 --- 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 index 06e69c132bd..36207266e58 100644 --- 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 index ac0f59225e8..9c01cb9e9db 100644 --- 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 index 181f60538df..67ab8e052d1 100644 --- 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 index 95ed334c5d4..0ef8f056b3f 100644 --- a/src/libregex_macros/lib.rs +++ b/src/libregex_macros/lib.rs @@ -11,7 +11,6 @@ //! 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] @@ -19,7 +18,6 @@ #![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)] diff --git a/src/librlibc/lib.rs b/src/librlibc/lib.rs index 7b0fd3d6366..98ba9990d9b 100644 --- a/src/librlibc/lib.rs +++ b/src/librlibc/lib.rs @@ -20,7 +20,6 @@ //! necessary. It is an error to include this library when also linking with //! the system libc library. -#![crate_id = "rlibc#0.11.0"] // NOTE: remove after stage0 #![crate_name = "rlibc"] #![license = "MIT/ASL2"] #![crate_type = "rlib"] @@ -28,7 +27,6 @@ html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://doc.rust-lang.org/0.11.0/")] #![feature(intrinsics)] -#![allow(unused_attribute)] // NOTE: remove after stage0 #![no_std] #![experimental] diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs index eee909f59e3..6e28d0cce32 100644 --- a/src/librustc/lib.rs +++ b/src/librustc/lib.rs @@ -18,7 +18,6 @@ This API is completely unstable and subject to change. */ -#![crate_id = "rustc#0.11.0"] // NOTE: remove after stage0 #![crate_name = "rustc"] #![experimental] #![comment = "The Rust compiler"] @@ -32,7 +31,6 @@ This API is completely unstable and subject to change. #![allow(deprecated)] #![feature(macro_rules, globs, struct_variant, managed_boxes, quote)] #![feature(default_type_params, phase, unsafe_destructor)] -#![allow(unused_attribute)] // NOTE: remove after stage0 extern crate arena; extern crate debug; diff --git a/src/librustc/plugin/mod.rs b/src/librustc/plugin/mod.rs index fa70ffc7392..71423ee56bc 100644 --- a/src/librustc/plugin/mod.rs +++ b/src/librustc/plugin/mod.rs @@ -22,7 +22,7 @@ * `#[plugin_registrar]` function: * * ```rust,ignore - * #![crate_id = "myplugin"] + * #![crate_name = "myplugin"] * #![crate_type = "dylib"] * #![feature(plugin_registrar)] * diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs index 542bc68ef73..6526943955c 100644 --- a/src/librustc/util/ppaux.rs +++ b/src/librustc/util/ppaux.rs @@ -212,11 +212,6 @@ pub fn mt_to_string(cx: &ctxt, m: &mt) -> String { format!("{}{}", mutability_to_string(m.mutbl), ty_to_string(cx, m.ty)) } -#[cfg(stage0)] -pub fn trait_store_to_str(cx: &ctxt, s: ty::TraitStore) -> String { - trait_store_to_string(cx, s) -} - pub fn trait_store_to_string(cx: &ctxt, s: ty::TraitStore) -> String { match s { ty::UniqTraitStore => "Box ".to_string(), @@ -240,11 +235,6 @@ pub fn trait_ref_to_string(cx: &ctxt, trait_ref: &ty::TraitRef) -> String { trait_ref.user_string(cx).to_string() } -#[cfg(stage0)] -pub fn ty_to_str(cx: &ctxt, typ: t) -> String { - ty_to_string(cx, typ) -} - pub fn ty_to_string(cx: &ctxt, typ: t) -> String { fn fn_input_to_string(cx: &ctxt, input: ty::t) -> String { ty_to_string(cx, input).to_string() diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index b53363738ac..fc2fe00afbc 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -8,14 +8,12 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id = "rustdoc#0.11.0"] // NOTE: remove after stage0 #![crate_name = "rustdoc"] #![experimental] #![desc = "rustdoc, the Rust documentation extractor"] #![license = "MIT/ASL2"] #![crate_type = "dylib"] #![crate_type = "rlib"] -#![allow(unused_attribute)] // NOTE: remove after stage0 #![feature(globs, struct_variant, managed_boxes, macro_rules, phase)] diff --git a/src/librustrt/lib.rs b/src/librustrt/lib.rs index 1a67f6d86ba..b707c62bb70 100644 --- a/src/librustrt/lib.rs +++ b/src/librustrt/lib.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_id = "rustrt#0.11.0"] // NOTE: remove after stage0 #![crate_name = "rustrt"] #![license = "MIT/ASL2"] #![crate_type = "rlib"] @@ -21,7 +20,6 @@ #![feature(linkage, lang_items, unsafe_destructor)] #![no_std] #![experimental] -#![allow(unused_attribute)] // NOTE: remove after stage0 #[phase(plugin, link)] extern crate core; extern crate alloc; diff --git a/src/librustuv/lib.rs b/src/librustuv/lib.rs index 972a28dda62..0151be81e63 100644 --- a/src/librustuv/lib.rs +++ b/src/librustuv/lib.rs @@ -34,7 +34,6 @@ via `close` and `delete` methods. */ -#![crate_id = "rustuv#0.11.0"] // NOTE: remove after stage0 #![crate_name = "rustuv"] #![experimental] #![license = "MIT/ASL2"] @@ -48,7 +47,6 @@ via `close` and `delete` methods. #![feature(macro_rules, unsafe_destructor)] #![deny(unused_result, unused_must_use)] #![allow(visible_private_types)] -#![allow(unused_attribute)] // NOTE: remove after stage0 #[cfg(test)] extern crate green; #[cfg(test)] extern crate debug; diff --git a/src/libsemver/lib.rs b/src/libsemver/lib.rs index 95eac25ab5b..22664ba2628 100644 --- a/src/libsemver/lib.rs +++ b/src/libsemver/lib.rs @@ -28,7 +28,6 @@ //! An example version number with all five components is //! `0.8.1-rc.3.0+20130922.linux`. -#![crate_id = "semver#0.11.0"] // NOTE: remove after stage0 #![crate_name = "semver"] #![experimental] #![crate_type = "rlib"] @@ -37,7 +36,6 @@ #![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::char; use std::cmp; diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs index f635c3f4150..7e31d1d5921 100644 --- a/src/libserialize/lib.rs +++ b/src/libserialize/lib.rs @@ -14,7 +14,6 @@ Core encoding and decoding interfaces. */ -#![crate_id = "serialize#0.11.0"] // NOTE: remove after stage0 #![crate_name = "serialize"] #![experimental] #![crate_type = "rlib"] @@ -25,7 +24,6 @@ Core encoding and decoding interfaces. html_root_url = "http://doc.rust-lang.org/0.11.0/", html_playground_url = "http://play.rust-lang.org/")] #![feature(macro_rules, managed_boxes, default_type_params, phase)] -#![allow(unused_attribute)] // NOTE: remove after stage0 // test harness access #[cfg(test)] diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 586f513835b..14782cafce3 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -94,7 +94,6 @@ //! all the standard macros, such as `assert!`, `fail!`, `println!`, //! and `format!`, also available to all Rust code. -#![crate_id = "std#0.11.0"] // NOTE: remove after stage0 snap #![crate_name = "std"] #![unstable] #![comment = "The Rust standard library"] @@ -108,7 +107,6 @@ #![feature(macro_rules, globs, managed_boxes, linkage)] #![feature(default_type_params, phase, lang_items, unsafe_destructor)] -#![allow(unused_attribute)] // NOTE: remove after stage0 // Don't link to std. We are std. #![no_std] diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index 83ea33a1e69..21f80777293 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -45,7 +45,7 @@ #[doc(no_inline)] pub use ops::{BitAnd, BitOr, BitXor}; #[doc(no_inline)] pub use ops::{Drop, Deref, DerefMut}; #[doc(no_inline)] pub use ops::{Shl, Shr}; -#[doc(no_inline)] #[cfg(not(stage0))] pub use ops::{Index, IndexMut}; +#[doc(no_inline)] pub use ops::{Index, IndexMut}; #[doc(no_inline)] pub use option::{Option, Some, None}; #[doc(no_inline)] pub use result::{Result, Ok, Err}; diff --git a/src/libsync/lib.rs b/src/libsync/lib.rs index c0d62caaa6b..45e8f348ff5 100644 --- a/src/libsync/lib.rs +++ b/src/libsync/lib.rs @@ -17,7 +17,6 @@ //! use this crate specifically. Instead, its functionality is reexported //! through `std::sync`. -#![crate_id = "sync#0.11.0"] // NOTE: remove after stage0 snap #![crate_name = "sync"] #![experimental] #![crate_type = "rlib"] @@ -31,7 +30,6 @@ #![feature(phase, globs, macro_rules, unsafe_destructor)] #![deny(missing_doc)] #![no_std] -#![allow(unused_attribute)] // NOTE: remove after stage0 #[phase(plugin, link)] extern crate core; extern crate alloc; diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 53ee991385a..1ef376c6615 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -14,7 +14,6 @@ //! //! This API is completely unstable and subject to change. -#![crate_id = "syntax#0.11.0"] // NOTE: remove after stage0 #![crate_name = "syntax"] #![experimental] #![license = "MIT/ASL2"] @@ -27,7 +26,6 @@ #![feature(macro_rules, globs, managed_boxes, default_type_params, phase)] #![feature(quote, unsafe_destructor)] #![allow(deprecated)] -#![allow(unused_attribute)] // NOTE: remove after stage0 extern crate serialize; extern crate term; diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 170cb7a249c..9589a923485 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -245,146 +245,6 @@ pub fn arg_to_string(arg: &ast::Arg) -> String { to_string(|s| s.print_arg(arg)) } - - -#[cfg(stage0)] -pub fn to_str(f: |&mut State| -> IoResult<()>) -> String { - let mut s = rust_printer(box MemWriter::new()); - f(&mut s).unwrap(); - eof(&mut s.s).unwrap(); - unsafe { - // FIXME(pcwalton): A nasty function to extract the string from an `io::Writer` - // that we "know" to be a `MemWriter` that works around the lack of checked - // downcasts. - let (_, wr): (uint, Box) = mem::transmute_copy(&s.s.out); - let result = - str::from_utf8_owned(Vec::from_slice(wr.get_ref())).unwrap(); - mem::forget(wr); - result.to_string() - } -} - -#[cfg(stage0)] -pub fn ty_to_str(ty: &ast::Ty) -> String { - to_str(|s| s.print_type(ty)) -} - -#[cfg(stage0)] -pub fn pat_to_str(pat: &ast::Pat) -> String { - to_str(|s| s.print_pat(pat)) -} - -#[cfg(stage0)] -pub fn expr_to_str(e: &ast::Expr) -> String { - to_str(|s| s.print_expr(e)) -} - -#[cfg(stage0)] -pub fn lifetime_to_str(e: &ast::Lifetime) -> String { - to_str(|s| s.print_lifetime(e)) -} - -#[cfg(stage0)] -pub fn tt_to_str(tt: &ast::TokenTree) -> String { - to_str(|s| s.print_tt(tt)) -} - -#[cfg(stage0)] -pub fn tts_to_str(tts: &[ast::TokenTree]) -> String { - to_str(|s| s.print_tts(tts)) -} - -#[cfg(stage0)] -pub fn stmt_to_str(stmt: &ast::Stmt) -> String { - to_str(|s| s.print_stmt(stmt)) -} - -#[cfg(stage0)] -pub fn item_to_str(i: &ast::Item) -> String { - to_str(|s| s.print_item(i)) -} - -#[cfg(stage0)] -pub fn generics_to_str(generics: &ast::Generics) -> String { - to_str(|s| s.print_generics(generics)) -} - -#[cfg(stage0)] -pub fn ty_method_to_str(p: &ast::TypeMethod) -> String { - to_str(|s| s.print_ty_method(p)) -} - -#[cfg(stage0)] -pub fn method_to_str(p: &ast::Method) -> String { - to_str(|s| s.print_method(p)) -} - -#[cfg(stage0)] -pub fn fn_block_to_str(p: &ast::FnDecl) -> String { - to_str(|s| s.print_fn_block_args(p)) -} - -#[cfg(stage0)] -pub fn path_to_str(p: &ast::Path) -> String { - to_str(|s| s.print_path(p, false)) -} - -#[cfg(stage0)] -pub fn fun_to_str(decl: &ast::FnDecl, fn_style: ast::FnStyle, name: ast::Ident, - opt_explicit_self: Option, - generics: &ast::Generics) -> String { - to_str(|s| { - try!(s.print_fn(decl, Some(fn_style), abi::Rust, - name, generics, opt_explicit_self, ast::Inherited)); - try!(s.end()); // Close the head box - s.end() // Close the outer box - }) -} - -#[cfg(stage0)] -pub fn block_to_str(blk: &ast::Block) -> String { - to_str(|s| { - // containing cbox, will be closed by print-block at } - try!(s.cbox(indent_unit)); - // head-ibox, will be closed by print-block after { - try!(s.ibox(0u)); - s.print_block(blk) - }) -} - -#[cfg(stage0)] -pub fn meta_item_to_str(mi: &ast::MetaItem) -> String { - to_str(|s| s.print_meta_item(mi)) -} - -#[cfg(stage0)] -pub fn attribute_to_str(attr: &ast::Attribute) -> String { - to_str(|s| s.print_attribute(attr)) -} - -#[cfg(stage0)] -pub fn lit_to_str(l: &ast::Lit) -> String { - to_str(|s| s.print_literal(l)) -} - -#[cfg(stage0)] -pub fn explicit_self_to_str(explicit_self: ast::ExplicitSelf_) -> String { - to_str(|s| s.print_explicit_self(explicit_self, ast::MutImmutable).map(|_| {})) -} - -#[cfg(stage0)] -pub fn variant_to_str(var: &ast::Variant) -> String { - to_str(|s| s.print_variant(var)) -} - -#[cfg(stage0)] -pub fn arg_to_str(arg: &ast::Arg) -> String { - to_str(|s| s.print_arg(arg)) -} - - - - pub fn visibility_qualified(vis: ast::Visibility, s: &str) -> String { match vis { ast::Public => format!("pub {}", s), diff --git a/src/libterm/lib.rs b/src/libterm/lib.rs index cdd067cef5b..66a1d4e797d 100644 --- a/src/libterm/lib.rs +++ b/src/libterm/lib.rs @@ -38,7 +38,6 @@ //! [win]: http://msdn.microsoft.com/en-us/library/windows/desktop/ms682010%28v=vs.85%29.aspx //! [ti]: https://en.wikipedia.org/wiki/Terminfo -#![crate_id = "term#0.11.0"] // NOTE: remove after stage0 #![crate_name = "term"] #![experimental] #![comment = "Simple ANSI color library"] @@ -49,7 +48,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 #![feature(macro_rules, phase)] diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index b80f47e6c93..4c982aa27c5 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -23,8 +23,7 @@ // running tests while providing a base that other test frameworks may // build off of. -#![crate_id = "test#0.11.0"] // NOTE: remove after stage0 -#![crate_name = "test"] // NOTE: remove after stage0 +#![crate_name = "test"] #![experimental] #![comment = "Rust internal test library only used by rustc"] #![license = "MIT/ASL2"] @@ -33,7 +32,6 @@ #![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(asm, macro_rules, phase)] diff --git a/src/libtime/lib.rs b/src/libtime/lib.rs index 9ed46d7a49b..19168469b5b 100644 --- a/src/libtime/lib.rs +++ b/src/libtime/lib.rs @@ -10,7 +10,6 @@ //! Simple time handling. -#![crate_id = "time#0.11.0"] // NOTE: remove after stage0 #![crate_name = "time"] #![experimental] @@ -22,7 +21,6 @@ html_root_url = "http://doc.rust-lang.org/0.11.0/", html_playground_url = "http://play.rust-lang.org/")] #![feature(phase)] -#![allow(unused_attribute)] // NOTE: remove after stage0 #[cfg(test)] extern crate debug; #[cfg(test)] #[phase(plugin, link)] extern crate log; diff --git a/src/liburl/lib.rs b/src/liburl/lib.rs index 129e3d0bf0a..be94f117b53 100644 --- a/src/liburl/lib.rs +++ b/src/liburl/lib.rs @@ -10,7 +10,6 @@ //! Types/fns concerning URLs (see RFC 3986) -#![crate_id = "url#0.11.0"] // NOTE: remove after stage0 #![crate_name = "url"] #![experimental] #![crate_type = "rlib"] @@ -21,7 +20,6 @@ html_root_url = "http://doc.rust-lang.org/0.11.0/", html_playground_url = "http://play.rust-lang.org/")] #![feature(default_type_params)] -#![allow(unused_attribute)] // NOTE: remove after stage0 use std::collections::HashMap; use std::fmt; diff --git a/src/libuuid/lib.rs b/src/libuuid/lib.rs index 7d93f1f52cf..1579b676660 100644 --- a/src/libuuid/lib.rs +++ b/src/libuuid/lib.rs @@ -54,7 +54,6 @@ Examples of string representations: */ -#![crate_id = "uuid#0.11.0"] // NOTE: remove after stage0 #![crate_name = "uuid"] #![experimental] #![crate_type = "rlib"] @@ -64,7 +63,6 @@ Examples of string representations: 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(default_type_params)] diff --git a/src/snapshots.txt b/src/snapshots.txt index 51676ec06e8..c0c7015e31a 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,3 +1,11 @@ +S 2014-07-09 8ddd286 + freebsd-x86_64 de0c39057f409b69e5ddb888ba3e20b90d63f5db + linux-i386 28bef31f2a017e1998256d0c2b2e0a0c9221451b + linux-x86_64 853bd73501a10d49cafdf823110c61f13a3392d6 + macos-i386 b89540ae54f9e565565d36147a586bb4bfbd861b + macos-x86_64 58709eb936e7fd66a28a1bb82aaf43a4d8260dea + winnt-i386 64a32dcb008d4590a6c6a9efaffbe1d22a334d34 + S 2014-07-05 aaff4e0 freebsd-x86_64 10272ca9eb17e1be4a4b172aacfb4b33fffcc8fb linux-i386 72ba9f6e0d096c30f128cb3736ffac0b57530a20