Remove #[crate_id]

mk/main.mk

@@ -16,6 +16,8 @@
 CFG_RELEASE_NUM=0.11.0
 CFG_RELEASE_LABEL=
 
+CFG_FILENAME_EXTRA=4e7c5e5c
+
 ifndef CFG_ENABLE_NIGHTLY
 # This is the normal version string
 CFG_RELEASE=$(CFG_RELEASE_NUM)$(CFG_RELEASE_LABEL)

mk/target.mk

@@ -44,6 +44,13 @@ $(foreach host,$(CFG_HOST),						    \
    $(foreach crate,$(CRATES),						    \
     $(eval $(call RUST_CRATE_FULLDEPS,$(stage),$(target),$(host),$(crate)))))))
 
+# NOTE: after a stage0 snap this should be just EXTRA_FILENAME, not with a stage
+# bound
+EXTRA_FILENAME_0 =
+EXTRA_FILENAME_1 = -C extra-filename=-$(CFG_FILENAME_EXTRA)
+EXTRA_FILENAME_2 = -C extra-filename=-$(CFG_FILENAME_EXTRA)
+EXTRA_FILENAME_3 = -C extra-filename=-$(CFG_FILENAME_EXTRA)
+
 # RUST_TARGET_STAGE_N template: This defines how target artifacts are built
 # for all stage/target architecture combinations. This is one giant rule which
 # works as follows:
@@ -85,7 +92,9 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4):				    \
 		-L "$$(LLVM_LIBDIR_$(2))" \
 		-L "$$(dir $$(LLVM_STDCPP_LOCATION_$(2)))" \
 		$$(RUSTFLAGS_$(4)) \
-		--out-dir $$(@D) $$<
+		--out-dir $$(@D) \
+		$$(EXTRA_FILENAME_$(1)) \
+		$$<
 	@touch $$@
 	$$(call LIST_ALL_OLD_GLOB_MATCHES,\
 	    $$(dir $$@)$$(call CFG_LIB_GLOB_$(2),$(4)))

src/liballoc/lib.rs

@@ -60,7 +60,8 @@
 //! 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"]
+#![crate_id = "alloc#0.11.0"] // NOTE: remove after a stage0 snap
+#![crate_name = "alloc"]
 #![experimental]
 #![license = "MIT/ASL2"]
 #![crate_type = "rlib"]
@@ -70,6 +71,7 @@
 
 #![no_std]
 #![feature(lang_items, phase, unsafe_destructor)]
+#![allow(unused_attribute)] // NOTE: remove after stage0
 
 #[phase(plugin, link)]
 extern crate core;

src/libarena/lib.rs

@@ -20,6 +20,7 @@
 //! more complex, slower Arena which can hold objects of any type.
 
 #![crate_id = "arena#0.11.0"]
+#![crate_name = "arena"]
 #![experimental]
 #![crate_type = "rlib"]
 #![crate_type = "dylib"]
@@ -30,6 +31,7 @@
 
 #![feature(unsafe_destructor)]
 #![allow(missing_doc)]
+#![allow(unused_attribute)] // NOTE: remove after stage0
 
 use std::cell::{Cell, RefCell};
 use std::cmp;

src/libcollections/lib.rs

@@ -12,7 +12,8 @@
  * Collection types.
  */
 
-#![crate_id = "collections#0.11.0"]
+#![crate_id = "collections#0.11.0"] // NOTE: remove after stage0
+#![crate_name = "collections"]
 #![experimental]
 #![crate_type = "rlib"]
 #![license = "MIT/ASL2"]
@@ -24,6 +25,7 @@
 #![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 alloc;

src/libcore/lib.rs

@@ -48,6 +48,7 @@
 // separate crate, libcoretest, to avoid bizarre issues.
 
 #![crate_id = "core#0.11.0"]
+#![crate_name = "core"]
 #![experimental]
 #![license = "MIT/ASL2"]
 #![crate_type = "rlib"]
@@ -60,6 +61,7 @@
 #![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;
 

src/libdebug/lib.rs

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

src/libflate/lib.rs

@@ -18,7 +18,8 @@ Simple [DEFLATE][def]-based compression. This is a wrapper around the
 
 */
 
-#![crate_id = "flate#0.11.0"]
+#![crate_id = "flate#0.11.0"] // NOTE: remove after stage0
+#![crate_name = "flate"]
 #![experimental]
 #![crate_type = "rlib"]
 #![crate_type = "dylib"]
@@ -27,6 +28,7 @@ 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;
 

src/libfmt_macros/lib.rs

@@ -14,12 +14,14 @@
 //! Parsing does not happen at runtime: structures of `std::fmt::rt` are
 //! generated instead.
 
-#![crate_id = "fmt_macros#0.11.0"]
+#![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;

src/libfourcc/lib.rs

@@ -39,14 +39,16 @@ fn main() {
 
 */
 
-#![crate_id = "fourcc#0.11.0"]
+#![crate_id = "fourcc#0.11.0"] // NOTE: remove after stage0
+#![crate_name = "fourcc"]
 #![experimental]
 #![crate_type = "rlib"]
 #![crate_type = "dylib"]
 #![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)]
 

src/libgetopts/lib.rs

@@ -76,7 +76,8 @@
 //! }
 //! ~~~
 
-#![crate_id = "getopts#0.11.0"]
+#![crate_id = "getopts#0.11.0"] // NOTE: remove after stage0
+#![crate_name = "getopts"]
 #![experimental]
 #![crate_type = "rlib"]
 #![crate_type = "dylib"]
@@ -87,6 +88,7 @@
        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;

src/libglob/lib.rs

@@ -23,7 +23,8 @@
  * `glob`/`fnmatch` functions.
  */
 
-#![crate_id = "glob#0.11.0"]
+#![crate_id = "glob#0.11.0"] // NOTE: remove after stage0
+#![crate_name = "glob"]
 #![experimental]
 #![crate_type = "rlib"]
 #![crate_type = "dylib"]
@@ -32,6 +33,7 @@
        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};

src/libgraphviz/lib.rs

@@ -266,16 +266,16 @@ pub fn main() {
 
 */
 
-#![crate_id = "graphviz#0.11.0"]
+#![crate_id = "graphviz#0.11.0"] // NOTE: remove after stage0
+#![crate_name = "graphviz"]
 #![experimental]
 #![crate_type = "rlib"]
 #![crate_type = "dylib"]
 #![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/")]
-
-#![experimental]
+#![allow(unused_attribute)] // NOTE: remove after stage0
 
 use std::io;
 use std::str;

src/libgreen/lib.rs

@@ -197,7 +197,8 @@
 //! pool.shutdown();
 //! ```
 
-#![crate_id = "green#0.11.0"]
+#![crate_id = "green#0.11.0"] // NOTE: remove after stage0
+#![crate_name = "green"]
 #![experimental]
 #![license = "MIT/ASL2"]
 #![crate_type = "rlib"]
@@ -208,10 +209,9 @@
        html_playground_url = "http://play.rust-lang.org/")]
 
 // NB this does *not* include globs, please keep it that way.
-#![feature(macro_rules, phase)]
-#![allow(visible_private_types)]
-#![allow(deprecated)]
-#![feature(default_type_params)]
+#![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;

src/libhexfloat/lib.rs

@@ -36,7 +36,8 @@ fn main() {
 
 */
 
-#![crate_id = "hexfloat#0.11.0"]
+#![crate_id = "hexfloat#0.11.0"] // NOTE: remove after stage0
+#![crate_name = "hexfloat"]
 #![experimental]
 #![crate_type = "rlib"]
 #![crate_type = "dylib"]
@@ -45,6 +46,7 @@ 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;

src/liblibc/lib.rs

@@ -9,7 +9,8 @@
 // except according to those terms.
 
 #![feature(globs)]
-#![crate_id = "libc#0.11.0"]
+#![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
            // yet. std depends on us.
@@ -18,6 +19,7 @@
        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

src/liblog/lib.rs

@@ -105,7 +105,8 @@ if logging is disabled, none of the components of the log will be executed.
 
 */
 
-#![crate_id = "log#0.11.0"]
+#![crate_id = "log#0.11.0"] // NOTE: Remove after stage0
+#![crate_name = "log"]
 #![experimental]
 #![license = "MIT/ASL2"]
 #![crate_type = "rlib"]
@@ -114,7 +115,7 @@ 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)]
 

src/libnative/lib.rs

@@ -46,7 +46,8 @@
 //! }
 //! ```
 
-#![crate_id = "native#0.11.0"]
+#![crate_id = "native#0.11.0"] // NOTE: remove after stage0
+#![crate_name = "native"]
 #![experimental]
 #![license = "MIT/ASL2"]
 #![crate_type = "rlib"]
@@ -57,6 +58,7 @@
 
 #![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

src/libnum/lib.rs

@@ -44,7 +44,8 @@
 
 #![feature(macro_rules)]
 
-#![crate_id = "num#0.11.0"]
+#![crate_id = "num#0.11.0"] // NOTE: remove after stage0
+#![crate_name = "num"]
 #![experimental]
 #![crate_type = "rlib"]
 #![crate_type = "dylib"]
@@ -53,7 +54,7 @@
        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;

src/librand/lib.rs

@@ -16,7 +16,8 @@
 //! is not recommended to use this library directly, but rather the official
 //! interface through `std::rand`.
 
-#![crate_id = "rand#0.11.0"]
+#![crate_id = "rand#0.11.0"] // NOTE: remove after a stage0 snap
+#![crate_name = "rand"]
 #![license = "MIT/ASL2"]
 #![crate_type = "rlib"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
@@ -25,6 +26,7 @@
        html_playground_url = "http://play.rust-lang.org/")]
 
 #![feature(macro_rules, phase, globs)]
+#![allow(unused_attribute)] // NOTE: remove after stage0
 #![no_std]
 #![experimental]
 

src/libregex/lib.rs

@@ -353,7 +353,8 @@
 //! characters in the search text and `m` is the number of instructions in a
 //! compiled expression.
 
-#![crate_id = "regex#0.11.0"]
+#![crate_id = "regex#0.11.0"] // NOTE: remove after stage0
+#![crate_name = "regex"]
 #![crate_type = "rlib"]
 #![crate_type = "dylib"]
 #![experimental]
@@ -364,6 +365,7 @@
        html_playground_url = "http://play.rust-lang.org/")]
 
 #![feature(macro_rules, phase)]
+#![allow(unused_attribute)] // NOTE: remove after stage0
 #![deny(missing_doc)]
 
 #[cfg(test)]

src/libregex_macros/lib.rs

@@ -11,13 +11,15 @@
 //! This crate provides the `regex!` macro. Its use is documented in the
 //! `regex` crate.
 
-#![crate_id = "regex_macros#0.11.0"]
+#![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)]