Auto merge of #38503 - brson:bootstrap, r=alexcrichton

Bump bootstrap compiler

r? @alexcrichton

I'm not clear on whether cargo will need to additionally be bumped beyond what's in https://github.com/rust-lang/rust/pull/38470

src/libcollections/Cargo.toml

@@ -16,6 +16,7 @@ std_unicode = { path = "../libstd_unicode" }
 name = "collectionstest"
 path = "../libcollectionstest/lib.rs"
 
-[[bench]]
+# FIXME: need to extract benchmarks to separate crate
-name = "collectionstest"
+#[[bench]]
-path = "../libcollectionstest/lib.rs"
+#name = "collectionstest"
+#path = "../libcollectionstest/lib.rs"

src/libcore/Cargo.toml

@@ -13,6 +13,7 @@ bench = false
 name = "coretest"
 path = "../libcoretest/lib.rs"
 
-[[bench]]
+# FIXME: need to extract benchmarks to a separate crate
-name = "coretest"
+#[[bench]]
-path = "../libcoretest/lib.rs"
+#name = "coretest"
+#path = "../libcoretest/lib.rs"

src/libproc_macro_tokens/Cargo.toml

@@ -2,6 +2,7 @@
 authors = ["The Rust Project Developers"]
 name = "proc_macro_tokens"
 version = "0.0.0"
+build = false
 
 [lib]
 path = "lib.rs"

src/librustc/lib.rs

@@ -30,7 +30,6 @@
 #![feature(conservative_impl_trait)]
 #![feature(const_fn)]
 #![feature(core_intrinsics)]
-#![cfg_attr(stage0, feature(item_like_imports))]
 #![feature(libc)]
 #![feature(nonzero)]
 #![feature(pub_restricted)]

src/librustc_llvm/ffi.rs

@@ -472,9 +472,7 @@ pub mod debuginfo {
 // generates an llvmdeps.rs file next to this one which will be
 // automatically updated whenever LLVM is updated to include an up-to-date
 // set of the libraries we need to link to LLVM for.
-#[cfg_attr(not(all(stage0,cargobuild)),
+#[link(name = "rustllvm", kind = "static")] // not quite true but good enough
-           link(name = "rustllvm", kind = "static"))] // not quite true but good enough
-#[cfg_attr(stage0, linked_from = "rustllvm")]
 extern "C" {
     // Create and destroy contexts.
     pub fn LLVMContextCreate() -> ContextRef;

src/librustc_llvm/lib.rs

@@ -27,9 +27,8 @@
 #![feature(concat_idents)]
 #![feature(libc)]
 #![feature(link_args)]
-#![cfg_attr(stage0, feature(linked_from))]
 #![feature(staged_api)]
-#![cfg_attr(not(stage0), feature(rustc_private))]
+#![feature(rustc_private)]
 
 extern crate libc;
 #[macro_use]

src/librustc_mir/lib.rs

@@ -22,7 +22,6 @@ Rust MIR: a lowered representation of Rust. Also: an experiment!
 
 #![feature(associated_consts)]
 #![feature(box_patterns)]
-#![cfg_attr(stage0, feature(item_like_imports))]
 #![feature(rustc_diagnostic_macros)]
 #![feature(rustc_private)]
 #![feature(staged_api)]

src/librustc_plugin/Cargo.toml

@@ -2,6 +2,7 @@
 authors = ["The Rust Project Developers"]
 name = "rustc_plugin"
 version = "0.0.0"
+build = false
 
 [lib]
 name = "rustc_plugin"

src/stage0.txt

@@ -12,5 +12,5 @@
 # tarball for a stable release you'll likely see `1.x.0-$date` where `1.x.0` was
 # released on `$date`
 
-rustc: beta-2016-12-16
+rustc: beta-2016-12-20
-cargo: fbeea902d2c9a5be6d99cc35681565d8f7832592
+cargo: bfee18f73287687c543bda8c35e4e33808792715

src/tools/rustbook/Cargo.toml

@@ -2,6 +2,7 @@
 authors = ["The Rust Project Developers"]
 name = "rustbook"
 version = "0.0.0"
+build = false
 
 [[bin]]
 name = "rustbook"