From 03bc2cf35a4e1d60ea745b6b1a9fcca0bf1ec897 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 28 Dec 2016 20:13:10 -0800
Subject: [PATCH] Fallout from updating bootstrap Cargo

---
 src/libcollections/Cargo.toml       | 7 ++++---
 src/libcore/Cargo.toml              | 7 ++++---
 src/libproc_macro_tokens/Cargo.toml | 1 +
 src/librustc/lib.rs                 | 1 -
 src/librustc_llvm/ffi.rs            | 4 +---
 src/librustc_llvm/lib.rs            | 3 +--
 src/librustc_mir/lib.rs             | 1 -
 src/librustc_plugin/Cargo.toml      | 1 +
 src/tools/rustbook/Cargo.toml       | 1 +
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/libcollections/Cargo.toml b/src/libcollections/Cargo.toml
index ab882fde9c277..186ba6e8f2112 100644
--- a/src/libcollections/Cargo.toml
+++ b/src/libcollections/Cargo.toml
@@ -16,6 +16,7 @@ std_unicode = { path = "../libstd_unicode" }
 name = "collectionstest"
 path = "../libcollectionstest/lib.rs"
 
-[[bench]]
-name = "collectionstest"
-path = "../libcollectionstest/lib.rs"
+# FIXME: need to extract benchmarks to separate crate
+#[[bench]]
+#name = "collectionstest"
+#path = "../libcollectionstest/lib.rs"
diff --git a/src/libcore/Cargo.toml b/src/libcore/Cargo.toml
index a72c712ad1733..e0dbc096cd0d9 100644
--- a/src/libcore/Cargo.toml
+++ b/src/libcore/Cargo.toml
@@ -13,6 +13,7 @@ bench = false
 name = "coretest"
 path = "../libcoretest/lib.rs"
 
-[[bench]]
-name = "coretest"
-path = "../libcoretest/lib.rs"
+# FIXME: need to extract benchmarks to a separate crate
+#[[bench]]
+#name = "coretest"
+#path = "../libcoretest/lib.rs"
diff --git a/src/libproc_macro_tokens/Cargo.toml b/src/libproc_macro_tokens/Cargo.toml
index 2b66d56759f35..b4365e4fb265a 100644
--- a/src/libproc_macro_tokens/Cargo.toml
+++ b/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"
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index ff508d2d8194a..efe855f0a39e9 100644
--- a/src/librustc/lib.rs
+++ b/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)]
diff --git a/src/librustc_llvm/ffi.rs b/src/librustc_llvm/ffi.rs
index f3dbac7ce682e..5fd85023e4174 100644
--- a/src/librustc_llvm/ffi.rs
+++ b/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
-#[cfg_attr(stage0, linked_from = "rustllvm")]
+#[link(name = "rustllvm", kind = "static")] // not quite true but good enough
 extern "C" {
     // Create and destroy contexts.
     pub fn LLVMContextCreate() -> ContextRef;
diff --git a/src/librustc_llvm/lib.rs b/src/librustc_llvm/lib.rs
index 69709f72b8b42..c8b1ea50f9786 100644
--- a/src/librustc_llvm/lib.rs
+++ b/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]
diff --git a/src/librustc_mir/lib.rs b/src/librustc_mir/lib.rs
index 617bd81d96a2c..56dadd2d673e1 100644
--- a/src/librustc_mir/lib.rs
+++ b/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)]
diff --git a/src/librustc_plugin/Cargo.toml b/src/librustc_plugin/Cargo.toml
index 514d81ecc94f2..48d4437358c58 100644
--- a/src/librustc_plugin/Cargo.toml
+++ b/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"
diff --git a/src/tools/rustbook/Cargo.toml b/src/tools/rustbook/Cargo.toml
index 956392ca540cd..e7690c03de5c3 100644
--- a/src/tools/rustbook/Cargo.toml
+++ b/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"