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

Closes #15544

3 files changed, 1 insertions, 13 deletions

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()