rustc: Rename rustc_macro to proc_macro

This commit blanket renames the `rustc_macro` infrastructure to `proc_macro`,
which reflects the general consensus of #35900. A follow up PR to Cargo will be
required to purge the `rustc-macro` name as well.

52 files changed, 209 insertions, 209 deletions

diff --git a/src/test/compile-fail-fulldeps/rustc-macro/at-the-root.rs b/src/test/compile-fail-fulldeps/proc-macro/at-the-root.rs
index 46724523d1c..b03e1e4f919 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/at-the-root.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/at-the-root.rs
@@ -8,15 +8,15 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![crate_type = "rustc-macro"]
-#![feature(rustc_macro)]
+#![crate_type = "proc-macro"]
+#![feature(proc_macro)]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-pub mod a { //~ `rustc-macro` crate types cannot export any items
-    use rustc_macro::TokenStream;
+pub mod a { //~ `proc-macro` crate types cannot export any items
+    use proc_macro::TokenStream;
 
-    #[rustc_macro_derive(B)]
+    #[proc_macro_derive(B)]
     pub fn bar(a: TokenStream) -> TokenStream {
     //~^ ERROR: must currently reside in the root of the crate
         a
diff --git a/src/test/compile-fail-fulldeps/proc-macro/attribute.rs b/src/test/compile-fail-fulldeps/proc-macro/attribute.rs
new file mode 100644
index 00000000000..d1b2aa330ed
--- /dev/null
+++ b/src/test/compile-fail-fulldeps/proc-macro/attribute.rs
@@ -0,0 +1,46 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![crate_type = "proc-macro"]
+#![feature(proc_macro)]
+
+extern crate proc_macro;
+
+#[proc_macro_derive]
+//~^ ERROR: attribute must be of form: #[proc_macro_derive(TraitName)]
+pub fn foo1(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    input
+}
+
+#[proc_macro_derive = "foo"]
+//~^ ERROR: attribute must be of form: #[proc_macro_derive(TraitName)]
+pub fn foo2(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    input
+}
+
+#[proc_macro_derive(
+    a = "b"
+)]
+//~^^ ERROR: must only be one word
+pub fn foo3(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    input
+}
+
+#[proc_macro_derive(b, c)]
+//~^ ERROR: attribute must only have one argument
+pub fn foo4(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    input
+}
+
+#[proc_macro_derive(d(e))]
+//~^ ERROR: must only be one word
+pub fn foo5(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    input
+}
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/auxiliary/derive-a-2.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-a-2.rs
index ff00a9d96a3..4aa4238611d 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/auxiliary/derive-a-2.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-a-2.rs
@@ -11,15 +11,15 @@
 // force-host
 // no-prefer-dynamic
 
-#![feature(rustc_macro)]
-#![feature(rustc_macro_lib)]
-#![crate_type = "rustc-macro"]
+#![feature(proc_macro)]
+#![feature(proc_macro_lib)]
+#![crate_type = "proc-macro"]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-use rustc_macro::TokenStream;
+use proc_macro::TokenStream;
 
-#[rustc_macro_derive(A)]
+#[proc_macro_derive(A)]
 pub fn derive_a(input: TokenStream) -> TokenStream {
     input
 }
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/auxiliary/derive-a.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-a.rs
index ff00a9d96a3..4aa4238611d 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/auxiliary/derive-a.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-a.rs
@@ -11,15 +11,15 @@
 // force-host
 // no-prefer-dynamic
 
-#![feature(rustc_macro)]
-#![feature(rustc_macro_lib)]
-#![crate_type = "rustc-macro"]
+#![feature(proc_macro)]
+#![feature(proc_macro_lib)]
+#![crate_type = "proc-macro"]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-use rustc_macro::TokenStream;
+use proc_macro::TokenStream;
 
-#[rustc_macro_derive(A)]
+#[proc_macro_derive(A)]
 pub fn derive_a(input: TokenStream) -> TokenStream {
     input
 }
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/auxiliary/derive-bad.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-bad.rs
index 5dd42d28b7b..aae8b63e253 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/auxiliary/derive-bad.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-bad.rs
@@ -11,15 +11,15 @@
 // no-prefer-dynamic
 // force-host
 
-#![feature(rustc_macro)]
-#![feature(rustc_macro_lib)]
-#![crate_type = "rustc-macro"]
+#![feature(proc_macro)]
+#![feature(proc_macro_lib)]
+#![crate_type = "proc-macro"]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-use rustc_macro::TokenStream;
+use proc_macro::TokenStream;
 
-#[rustc_macro_derive(A)]
+#[proc_macro_derive(A)]
 pub fn derive_a(_input: TokenStream) -> TokenStream {
     "struct A { inner }".parse().unwrap()
 }
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/auxiliary/derive-panic.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-panic.rs
index d867082ed5e..f426fe54376 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/auxiliary/derive-panic.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-panic.rs
@@ -11,15 +11,15 @@
 // no-prefer-dynamic
 // force-host
 
-#![feature(rustc_macro)]
-#![feature(rustc_macro_lib)]
-#![crate_type = "rustc-macro"]
+#![feature(proc_macro)]
+#![feature(proc_macro_lib)]
+#![crate_type = "proc-macro"]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-use rustc_macro::TokenStream;
+use proc_macro::TokenStream;
 
-#[rustc_macro_derive(A)]
+#[proc_macro_derive(A)]
 pub fn derive_a(_input: TokenStream) -> TokenStream {
     panic!("nope!");
 }
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/auxiliary/derive-unstable-2.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-unstable-2.rs
index 9eebad89756..d8952e3478b 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/auxiliary/derive-unstable-2.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-unstable-2.rs
@@ -11,15 +11,15 @@
 // force-host
 // no-prefer-dynamic
 
-#![feature(rustc_macro)]
-#![feature(rustc_macro_lib)]
-#![crate_type = "rustc-macro"]
+#![feature(proc_macro)]
+#![feature(proc_macro_lib)]
+#![crate_type = "proc-macro"]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-use rustc_macro::TokenStream;
+use proc_macro::TokenStream;
 
-#[rustc_macro_derive(Unstable)]
+#[proc_macro_derive(Unstable)]
 pub fn derive(_input: TokenStream) -> TokenStream {
 
     "
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/auxiliary/derive-unstable.rs b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-unstable.rs
index f4a1ec99700..1187b5102e2 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/auxiliary/derive-unstable.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-unstable.rs
@@ -11,15 +11,15 @@
 // force-host
 // no-prefer-dynamic
 
-#![feature(rustc_macro)]
-#![feature(rustc_macro_lib)]
-#![crate_type = "rustc-macro"]
+#![feature(proc_macro)]
+#![feature(proc_macro_lib)]
+#![crate_type = "proc-macro"]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-use rustc_macro::TokenStream;
+use proc_macro::TokenStream;
 
-#[rustc_macro_derive(Unstable)]
+#[proc_macro_derive(Unstable)]
 pub fn derive(_input: TokenStream) -> TokenStream {
 
     "unsafe fn foo() -> u32 { ::std::intrinsics::init() }".parse().unwrap()
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/cannot-link.rs b/src/test/compile-fail-fulldeps/proc-macro/cannot-link.rs
index 1f135330a99..f6f1be37fc3 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/cannot-link.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/cannot-link.rs
@@ -11,6 +11,6 @@
 // aux-build:derive-a.rs
 
 extern crate derive_a;
-//~^ ERROR: crates of the `rustc-macro` crate type cannot be linked at runtime
+//~^ ERROR: crates of the `proc-macro` crate type cannot be linked at runtime
 
 fn main() {}
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/define-two.rs b/src/test/compile-fail-fulldeps/proc-macro/define-two.rs
index e4f21dc2384..420249b2581 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/define-two.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/define-two.rs
@@ -10,19 +10,19 @@
 
 // no-prefer-dynamic
 
-#![crate_type = "rustc-macro"]
-#![feature(rustc_macro)]
+#![crate_type = "proc-macro"]
+#![feature(proc_macro)]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-use rustc_macro::TokenStream;
+use proc_macro::TokenStream;
 
-#[rustc_macro_derive(A)]
+#[proc_macro_derive(A)]
 pub fn foo(input: TokenStream) -> TokenStream {
     input
 }
 
-#[rustc_macro_derive(A)] //~ ERROR: derive mode defined twice in this crate
+#[proc_macro_derive(A)] //~ ERROR: derive mode defined twice in this crate
 pub fn bar(input: TokenStream) -> TokenStream {
     input
 }
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/derive-bad.rs b/src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs
index f3a73af2993..4cc6b9f984c 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/derive-bad.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs
@@ -10,7 +10,7 @@
 
 // aux-build:derive-bad.rs
 
-#![feature(rustc_macro)]
+#![feature(proc_macro)]
 
 #[macro_use]
 extern crate derive_bad;
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/derive-still-gated.rs b/src/test/compile-fail-fulldeps/proc-macro/derive-still-gated.rs
index a46d79f517f..eb0bb00be91 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/derive-still-gated.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/derive-still-gated.rs
@@ -10,7 +10,7 @@
 
 // aux-build:derive-a.rs
 
-#![feature(rustc_macro)]
+#![feature(proc_macro)]
 #![allow(warnings)]
 
 #[macro_use]
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/expand-to-unstable-2.rs b/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs
index 14c3d84e75b..23dcbe03b5f 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/expand-to-unstable-2.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs
@@ -10,7 +10,7 @@
 
 // aux-build:derive-unstable-2.rs
 
-#![feature(rustc_macro)]
+#![feature(proc_macro)]
 #![allow(warnings)]
 
 #[macro_use]
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/expand-to-unstable.rs b/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs
index aa9aaa81156..fb86f6f1b65 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/expand-to-unstable.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs
@@ -10,7 +10,7 @@
 
 // aux-build:derive-unstable.rs
 
-#![feature(rustc_macro)]
+#![feature(proc_macro)]
 #![allow(warnings)]
 
 #[macro_use]
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/export-macro.rs b/src/test/compile-fail-fulldeps/proc-macro/export-macro.rs
index 759f3d32e16..48b73e73331 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/export-macro.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/export-macro.rs
@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: cannot export macro_rules! macros from a `rustc-macro` crate
+// error-pattern: cannot export macro_rules! macros from a `proc-macro` crate
 
-#![crate_type = "rustc-macro"]
-#![feature(rustc_macro)]
+#![crate_type = "proc-macro"]
+#![feature(proc_macro)]
 
 #[macro_export]
 macro_rules! foo {
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/exports.rs b/src/test/compile-fail-fulldeps/proc-macro/exports.rs
index e985356dc58..41b94d04e8c 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/exports.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/exports.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![crate_type = "rustc-macro"]
+#![crate_type = "proc-macro"]
 #![allow(warnings)]
 
 pub fn a() {} //~ ERROR: cannot export any items
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/feature-gate-1.rs b/src/test/compile-fail-fulldeps/proc-macro/feature-gate-1.rs
index 86afc08cae8..f5618fc6425 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/feature-gate-1.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/feature-gate-1.rs
@@ -8,6 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: the `rustc-macro` crate type is experimental
+// error-pattern: the `proc-macro` crate type is experimental
 
-#![crate_type = "rustc-macro"]
+#![crate_type = "proc-macro"]
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/feature-gate-2.rs b/src/test/compile-fail-fulldeps/proc-macro/feature-gate-2.rs
index 1a19f6046d9..9c4053266f4 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/feature-gate-2.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/feature-gate-2.rs
@@ -8,6 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate rustc_macro; //~ ERROR: use of unstable library feature
+extern crate proc_macro; //~ ERROR: use of unstable library feature
 
 fn main() {}
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/feature-gate-3.rs b/src/test/compile-fail-fulldeps/proc-macro/feature-gate-3.rs
index 9f47f07bd02..bb6b5759622 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/feature-gate-3.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/feature-gate-3.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![crate_type = "rustc-macro"]
+#![crate_type = "proc-macro"]
 
-#[rustc_macro_derive(Foo)] //~ ERROR: is an experimental feature
+#[proc_macro_derive(Foo)] //~ ERROR: is an experimental feature
 pub fn foo() {
 }
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/feature-gate-4.rs b/src/test/compile-fail-fulldeps/proc-macro/feature-gate-4.rs
index 0fdd13bc30c..0fdd13bc30c 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/feature-gate-4.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/feature-gate-4.rs
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/feature-gate-5.rs b/src/test/compile-fail-fulldeps/proc-macro/feature-gate-5.rs
index e44b29a1705..672579ce8f1 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/feature-gate-5.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/feature-gate-5.rs
@@ -8,5 +8,5 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[cfg(rustc_macro)] //~ ERROR: experimental and subject to change
+#[cfg(proc_macro)] //~ ERROR: experimental and subject to change
 fn foo() {}
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/import.rs b/src/test/compile-fail-fulldeps/proc-macro/import.rs
index c1d0823cb6b..8f907183cc3 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/import.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/import.rs
@@ -10,7 +10,7 @@
 
 // aux-build:derive-a.rs
 
-#![feature(rustc_macro)]
+#![feature(proc_macro)]
 #![allow(warnings)]
 
 #[macro_use]
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/load-panic.rs b/src/test/compile-fail-fulldeps/proc-macro/load-panic.rs
index 0d08d27c38e..39c27e82fa5 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/load-panic.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/load-panic.rs
@@ -10,7 +10,7 @@
 
 // aux-build:derive-panic.rs
 
-#![feature(rustc_macro)]
+#![feature(proc_macro)]
 
 #[macro_use]
 extern crate derive_panic;
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/require-rustc-macro-crate-type.rs b/src/test/compile-fail-fulldeps/proc-macro/require-rustc-macro-crate-type.rs
index cdc50acea92..44397cdde0c 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/require-rustc-macro-crate-type.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/require-rustc-macro-crate-type.rs
@@ -8,13 +8,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(rustc_macro)]
+#![feature(proc_macro)]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-#[rustc_macro_derive(Foo)]
-//~^ ERROR: only usable with crates of the `rustc-macro` crate type
-pub fn foo(a: rustc_macro::TokenStream) -> rustc_macro::TokenStream {
+#[proc_macro_derive(Foo)]
+//~^ ERROR: only usable with crates of the `proc-macro` crate type
+pub fn foo(a: proc_macro::TokenStream) -> proc_macro::TokenStream {
     a
 }
 
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/shadow-builtin.rs b/src/test/compile-fail-fulldeps/proc-macro/shadow-builtin.rs
index 1353a234b48..5cb2cc59aab 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/shadow-builtin.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/shadow-builtin.rs
@@ -8,14 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![crate_type = "rustc-macro"]
-#![feature(rustc_macro)]
+#![crate_type = "proc-macro"]
+#![feature(proc_macro)]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-use rustc_macro::TokenStream;
+use proc_macro::TokenStream;
 
-#[rustc_macro_derive(PartialEq)]
+#[proc_macro_derive(PartialEq)]
 //~^ ERROR: cannot override a built-in #[derive] mode
 pub fn foo(input: TokenStream) -> TokenStream {
     input
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/shadow.rs b/src/test/compile-fail-fulldeps/proc-macro/shadow.rs
index 33330ed8f6a..7b1a73d50f6 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/shadow.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/shadow.rs
@@ -11,7 +11,7 @@
 // aux-build:derive-a.rs
 // aux-build:derive-a-2.rs
 
-#![feature(rustc_macro)]
+#![feature(proc_macro)]
 
 #[macro_use]
 extern crate derive_a;
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/signature.rs b/src/test/compile-fail-fulldeps/proc-macro/signature.rs
index 9662cc69e1e..468c970599e 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/signature.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/signature.rs
@@ -8,17 +8,17 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![crate_type = "rustc-macro"]
-#![feature(rustc_macro)]
+#![crate_type = "proc-macro"]
+#![feature(proc_macro)]
 #![allow(warnings)]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-#[rustc_macro_derive(A)]
+#[proc_macro_derive(A)]
 unsafe extern fn foo(a: i32, b: u32) -> u32 {
     //~^ ERROR: mismatched types
     //~| NOTE: expected normal fn, found unsafe fn
-    //~| NOTE: expected type `fn(rustc_macro::TokenStream) -> rustc_macro::TokenStream`
+    //~| NOTE: expected type `fn(proc_macro::TokenStream) -> proc_macro::TokenStream`
     //~| NOTE: found type `unsafe extern "C" fn(i32, u32) -> u32 {foo}`
     loop {}
 }
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/two-crate-types-1.rs b/src/test/compile-fail-fulldeps/proc-macro/two-crate-types-1.rs
index 35f6149ad49..db646fb7815 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/two-crate-types-1.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/two-crate-types-1.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: cannot mix `rustc-macro` crate type with others
+// error-pattern: cannot mix `proc-macro` crate type with others
 
-#![crate_type = "rustc-macro"]
+#![crate_type = "proc-macro"]
 #![crate_type = "rlib"]
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/two-crate-types-2.rs b/src/test/compile-fail-fulldeps/proc-macro/two-crate-types-2.rs
index ec95e3e4685..97b0f844604 100644
--- a/src/test/compile-fail-fulldeps/rustc-macro/two-crate-types-2.rs
+++ b/src/test/compile-fail-fulldeps/proc-macro/two-crate-types-2.rs
@@ -8,5 +8,5 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: cannot mix `rustc-macro` crate type with others
-// compile-flags: --crate-type rlib --crate-type rustc-macro
+// error-pattern: cannot mix `proc-macro` crate type with others
+// compile-flags: --crate-type rlib --crate-type proc-macro
diff --git a/src/test/compile-fail-fulldeps/rustc-macro/attribute.rs b/src/test/compile-fail-fulldeps/rustc-macro/attribute.rs
deleted file mode 100644
index 7740238aeac..00000000000
--- a/src/test/compile-fail-fulldeps/rustc-macro/attribute.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![crate_type = "rustc-macro"]
-#![feature(rustc_macro)]
-
-extern crate rustc_macro;
-
-#[rustc_macro_derive]
-//~^ ERROR: attribute must be of form: #[rustc_macro_derive(TraitName)]
-pub fn foo1(input: rustc_macro::TokenStream) -> rustc_macro::TokenStream {
-    input
-}
-
-#[rustc_macro_derive = "foo"]
-//~^ ERROR: attribute must be of form: #[rustc_macro_derive(TraitName)]
-pub fn foo2(input: rustc_macro::TokenStream) -> rustc_macro::TokenStream {
-    input
-}
-
-#[rustc_macro_derive(
-    a = "b"
-)]
-//~^^ ERROR: must only be one word
-pub fn foo3(input: rustc_macro::TokenStream) -> rustc_macro::TokenStream {
-    input
-}
-
-#[rustc_macro_derive(b, c)]
-//~^ ERROR: attribute must only have one argument
-pub fn foo4(input: rustc_macro::TokenStream) -> rustc_macro::TokenStream {
-    input
-}
-
-#[rustc_macro_derive(d(e))]
-//~^ ERROR: must only be one word
-pub fn foo5(input: rustc_macro::TokenStream) -> rustc_macro::TokenStream {
-    input
-}
diff --git a/src/test/run-make/rustc-macro-dep-files/Makefile b/src/test/run-make/rustc-macro-dep-files/Makefile
index d27b5d0f3c4..e3a6776c808 100644
--- a/src/test/run-make/rustc-macro-dep-files/Makefile
+++ b/src/test/run-make/rustc-macro-dep-files/Makefile
@@ -3,4 +3,4 @@
 all:
 	$(RUSTC) foo.rs
 	$(RUSTC) bar.rs --emit dep-info
-	grep "rustc-macro source" $(TMPDIR)/bar.d && exit 1 || exit 0
+	grep "proc-macro source" $(TMPDIR)/bar.d && exit 1 || exit 0
diff --git a/src/test/run-make/rustc-macro-dep-files/bar.rs b/src/test/run-make/rustc-macro-dep-files/bar.rs
index dac652797e6..a2db98049d2 100644
--- a/src/test/run-make/rustc-macro-dep-files/bar.rs
+++ b/src/test/run-make/rustc-macro-dep-files/bar.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(rustc_macro)]
+#![feature(proc_macro)]
 
 #[macro_use]
 extern crate foo;
diff --git a/src/test/run-make/rustc-macro-dep-files/foo.rs b/src/test/run-make/rustc-macro-dep-files/foo.rs
index c302ca824d0..bd9e9158c50 100644
--- a/src/test/run-make/rustc-macro-dep-files/foo.rs
+++ b/src/test/run-make/rustc-macro-dep-files/foo.rs
@@ -8,15 +8,15 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![crate_type = "rustc-macro"]
-#![feature(rustc_macro)]
-#![feature(rustc_macro_lib)]
+#![crate_type = "proc-macro"]
+#![feature(proc_macro)]
+#![feature(proc_macro_lib)]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-use rustc_macro::TokenStream;
+use proc_macro::TokenStream;
 
-#[rustc_macro_derive(A)]
+#[proc_macro_derive(A)]
 pub fn derive(input: TokenStream) -> TokenStream {
     let input = input.to_string();
     assert!(input.contains("struct A;"));
diff --git a/src/test/run-pass-fulldeps/auxiliary/cond_noprelude_plugin.rs b/src/test/run-pass-fulldeps/auxiliary/cond_noprelude_plugin.rs
index 6aee63e2858..78589546084 100644
--- a/src/test/run-pass-fulldeps/auxiliary/cond_noprelude_plugin.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/cond_noprelude_plugin.rs
@@ -12,13 +12,13 @@
 #![feature(plugin)]
 #![feature(plugin_registrar)]
 #![feature(rustc_private)]
-#![plugin(proc_macro)]
+#![plugin(proc_macro_plugin)]
 
 extern crate rustc_plugin;
-extern crate proc_macro;
+extern crate proc_macro_plugin;
 extern crate syntax;
 
-use proc_macro::build::ident_eq;
+use proc_macro_plugin::build::ident_eq;
 
 use syntax::ext::base::{ExtCtxt, MacResult};
 use syntax::ext::proc_macro_shim::build_block_emitter;
diff --git a/src/test/run-pass-fulldeps/auxiliary/cond_plugin.rs b/src/test/run-pass-fulldeps/auxiliary/cond_plugin.rs
index 8291c8a1e41..11322bf76ff 100644
--- a/src/test/run-pass-fulldeps/auxiliary/cond_plugin.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/cond_plugin.rs
@@ -12,13 +12,13 @@
 #![feature(plugin)]
 #![feature(plugin_registrar)]
 #![feature(rustc_private)]
-#![plugin(proc_macro)]
+#![plugin(proc_macro_plugin)]
 
 extern crate rustc_plugin;
-extern crate proc_macro;
+extern crate proc_macro_plugin;
 extern crate syntax;
 
-use proc_macro::prelude::*;
+use proc_macro_plugin::prelude::*;
 
 use rustc_plugin::Registry;
 
diff --git a/src/test/run-pass-fulldeps/auxiliary/cond_prelude_plugin.rs b/src/test/run-pass-fulldeps/auxiliary/cond_prelude_plugin.rs
index 2d92a0ef181..232a7166e3b 100644
--- a/src/test/run-pass-fulldeps/auxiliary/cond_prelude_plugin.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/cond_prelude_plugin.rs
@@ -12,14 +12,14 @@
 #![feature(plugin)]
 #![feature(plugin_registrar)]
 #![feature(rustc_private)]
-#![plugin(proc_macro)]
+#![plugin(proc_macro_plugin)]
 
 extern crate rustc_plugin;
-extern crate proc_macro;
+extern crate proc_macro_plugin;
 extern crate syntax;
 
 use syntax::ext::proc_macro_shim::prelude::*;
-use proc_macro::prelude::*;
+use proc_macro_plugin::prelude::*;
 
 use rustc_plugin::Registry;
 
diff --git a/src/test/run-pass-fulldeps/auxiliary/proc_macro_def.rs b/src/test/run-pass-fulldeps/auxiliary/proc_macro_def.rs
index 52c38a6ee03..961df6d5c0c 100644
--- a/src/test/run-pass-fulldeps/auxiliary/proc_macro_def.rs
+++ b/src/test/run-pass-fulldeps/auxiliary/proc_macro_def.rs
@@ -10,11 +10,11 @@
 
 #![feature(plugin, plugin_registrar, rustc_private)]
 
-extern crate proc_macro;
+extern crate proc_macro_plugin;
 extern crate rustc_plugin;
 extern crate syntax;
 
-use proc_macro::prelude::*;
+use proc_macro_plugin::prelude::*;
 use rustc_plugin::Registry;
 use syntax::ext::base::SyntaxExtension;
 use syntax::ext::proc_macro_shim::prelude::*;
diff --git a/src/test/run-pass-fulldeps/macro-quote-1.rs b/src/test/run-pass-fulldeps/macro-quote-1.rs
index 4ee775dec0c..a5ac546cba4 100644
--- a/src/test/run-pass-fulldeps/macro-quote-1.rs
+++ b/src/test/run-pass-fulldeps/macro-quote-1.rs
@@ -12,10 +12,10 @@
 
 #![feature(plugin)]
 #![feature(rustc_private)]
-#![plugin(proc_macro)]
+#![plugin(proc_macro_plugin)]
 
-extern crate proc_macro;
-use proc_macro::prelude::*;
+extern crate proc_macro_plugin;
+use proc_macro_plugin::prelude::*;
 
 extern crate syntax;
 use syntax::ast::Ident;
diff --git a/src/test/run-pass-fulldeps/rustc-macro/add-impl.rs b/src/test/run-pass-fulldeps/proc-macro/add-impl.rs
index 226c082564a..e82282f3d8c 100644
--- a/src/test/run-pass-fulldeps/rustc-macro/add-impl.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/add-impl.rs
@@ -10,7 +10,7 @@
 
 // aux-build:add-impl.rs
 
-#![feature(rustc_macro)]
+#![feature(proc_macro)]
 
 #[macro_use]
 extern crate add_impl;
diff --git a/src/test/run-pass-fulldeps/rustc-macro/append-impl.rs b/src/test/run-pass-fulldeps/proc-macro/append-impl.rs
index b7025c61fb6..f062111df9d 100644
--- a/src/test/run-pass-fulldeps/rustc-macro/append-impl.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/append-impl.rs
@@ -10,7 +10,7 @@
 
 // aux-build:append-impl.rs
 
-#![feature(rustc_macro)]
+#![feature(proc_macro)]
 #![allow(warnings)]
 
 #[macro_use]
diff --git a/src/test/run-pass-fulldeps/rustc-macro/auxiliary/add-impl.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/add-impl.rs
index 8aab423af0a..99586b0bb49 100644
--- a/src/test/run-pass-fulldeps/rustc-macro/auxiliary/add-impl.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/add-impl.rs
@@ -10,16 +10,16 @@
 
 // no-prefer-dynamic
 
-#![crate_type = "rustc-macro"]
-#![feature(rustc_macro)]
-#![feature(rustc_macro_lib)]
+#![crate_type = "proc-macro"]
+#![feature(proc_macro)]
+#![feature(proc_macro_lib)]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-use rustc_macro::TokenStream;
+use proc_macro::TokenStream;
 
-#[rustc_macro_derive(AddImpl)]
-// #[cfg(rustc_macro)]
+#[proc_macro_derive(AddImpl)]
+// #[cfg(proc_macro)]
 pub fn derive(input: TokenStream) -> TokenStream {
     (input.to_string() + "
         impl B {
diff --git a/src/test/run-pass-fulldeps/rustc-macro/auxiliary/append-impl.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/append-impl.rs
index c3d295e02c1..27c3d643ca4 100644
--- a/src/test/run-pass-fulldeps/rustc-macro/auxiliary/append-impl.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/append-impl.rs
@@ -11,15 +11,15 @@
 // force-host
 // no-prefer-dynamic
 
-#![feature(rustc_macro)]
-#![feature(rustc_macro_lib)]
-#![crate_type = "rustc-macro"]
+#![feature(proc_macro)]
+#![feature(proc_macro_lib)]
+#![crate_type = "proc-macro"]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-use rustc_macro::TokenStream;
+use proc_macro::TokenStream;
 
-#[rustc_macro_derive(Append)]
+#[proc_macro_derive(Append)]
 pub fn derive_a(input: TokenStream) -> TokenStream {
     let mut input = input.to_string();
     input.push_str("
diff --git a/src/test/run-pass-fulldeps/rustc-macro/auxiliary/derive-a.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-a.rs
index 42155383dec..c2de173568b 100644
--- a/src/test/run-pass-fulldeps/rustc-macro/auxiliary/derive-a.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-a.rs
@@ -10,15 +10,15 @@
 
 // no-prefer-dynamic
 
-#![crate_type = "rustc-macro"]
-#![feature(rustc_macro)]
-#![feature(rustc_macro_lib)]
+#![crate_type = "proc-macro"]
+#![feature(proc_macro)]
+#![feature(proc_macro_lib)]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-use rustc_macro::TokenStream;
+use proc_macro::TokenStream;
 
-#[rustc_macro_derive(A)]
+#[proc_macro_derive(A)]
 pub fn derive(input: TokenStream) -> TokenStream {
     let input = input.to_string();
     assert!(input.contains("struct A;"));
diff --git a/src/test/run-pass-fulldeps/rustc-macro/auxiliary/derive-atob.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-atob.rs
index 5b85e2b2a7c..b9e31fc3329 100644
--- a/src/test/run-pass-fulldeps/rustc-macro/auxiliary/derive-atob.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-atob.rs
@@ -10,15 +10,15 @@
 
 // no-prefer-dynamic
 
-#![crate_type = "rustc-macro"]
-#![feature(rustc_macro)]
-#![feature(rustc_macro_lib)]
+#![crate_type = "proc-macro"]
+#![feature(proc_macro)]
+#![feature(proc_macro_lib)]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-use rustc_macro::TokenStream;
+use proc_macro::TokenStream;
 
-#[rustc_macro_derive(AToB)]
+#[proc_macro_derive(AToB)]
 pub fn derive(input: TokenStream) -> TokenStream {
     let input = input.to_string();
     assert_eq!(input, "struct A;\n");
diff --git a/src/test/run-pass-fulldeps/rustc-macro/auxiliary/derive-ctod.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-ctod.rs
index 54f8dff509a..50f1a390b29 100644
--- a/src/test/run-pass-fulldeps/rustc-macro/auxiliary/derive-ctod.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-ctod.rs
@@ -10,15 +10,15 @@
 
 // no-prefer-dynamic
 
-#![crate_type = "rustc-macro"]
-#![feature(rustc_macro)]
-#![feature(rustc_macro_lib)]
+#![crate_type = "proc-macro"]
+#![feature(proc_macro)]
+#![feature(proc_macro_lib)]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-use rustc_macro::TokenStream;
+use proc_macro::TokenStream;
 
-#[rustc_macro_derive(CToD)]
+#[proc_macro_derive(CToD)]
 pub fn derive(input: TokenStream) -> TokenStream {
     let input = input.to_string();
     assert_eq!(input, "struct C;\n");
diff --git a/src/test/run-pass-fulldeps/rustc-macro/auxiliary/derive-same-struct.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-same-struct.rs
index d83e352e3b1..bd283ca57eb 100644
--- a/src/test/run-pass-fulldeps/rustc-macro/auxiliary/derive-same-struct.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-same-struct.rs
@@ -9,23 +9,23 @@
 // except according to those terms.
 
 // no-prefer-dynamic
-// compile-flags:--crate-type rustc-macro
+// compile-flags:--crate-type proc-macro
 
-#![feature(rustc_macro)]
-#![feature(rustc_macro_lib)]
+#![feature(proc_macro)]
+#![feature(proc_macro_lib)]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-use rustc_macro::TokenStream;
+use proc_macro::TokenStream;
 
-#[rustc_macro_derive(AToB)]
+#[proc_macro_derive(AToB)]
 pub fn derive1(input: TokenStream) -> TokenStream {
     println!("input1: {:?}", input.to_string());
     assert_eq!(input.to_string(), "#[derive(BToC)]\nstruct A;\n");
     "#[derive(BToC)] struct B;".parse().unwrap()
 }
 
-#[rustc_macro_derive(BToC)]
+#[proc_macro_derive(BToC)]
 pub fn derive2(input: TokenStream) -> TokenStream {
     assert_eq!(input.to_string(), "struct B;\n");
     "struct C;".parse().unwrap()
diff --git a/src/test/run-pass-fulldeps/rustc-macro/auxiliary/expand-with-a-macro.rs b/src/test/run-pass-fulldeps/proc-macro/auxiliary/expand-with-a-macro.rs
index 96aea407e6e..155b125690c 100644
--- a/src/test/run-pass-fulldeps/rustc-macro/auxiliary/expand-with-a-macro.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/auxiliary/expand-with-a-macro.rs
@@ -10,16 +10,16 @@
 
 // no-prefer-dynamic
 
-#![crate_type = "rustc-macro"]
-#![feature(rustc_macro)]
-#![feature(rustc_macro_lib)]
+#![crate_type = "proc-macro"]
+#![feature(proc_macro)]
+#![feature(proc_macro_lib)]
 #![deny(warnings)]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-use rustc_macro::TokenStream;
+use proc_macro::TokenStream;
 
-#[rustc_macro_derive(A)]
+#[proc_macro_derive(A)]
 pub fn derive(input: TokenStream) -> TokenStream {
     let input = input.to_string();
     assert!(input.contains("struct A;"));
diff --git a/src/test/run-pass-fulldeps/rustc-macro/derive-same-struct.rs b/src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs
index ee0d5945648..b3edc8f1c31 100644
--- a/src/test/run-pass-fulldeps/rustc-macro/derive-same-struct.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs
@@ -10,7 +10,7 @@
 
 // aux-build:derive-same-struct.rs
 
-#![feature(rustc_macro)]
+#![feature(proc_macro)]
 
 #[macro_use]
 extern crate derive_same_struct;
diff --git a/src/test/run-pass-fulldeps/rustc-macro/expand-with-a-macro.rs b/src/test/run-pass-fulldeps/proc-macro/expand-with-a-macro.rs
index cc59be2d75d..16f3535adae 100644
--- a/src/test/run-pass-fulldeps/rustc-macro/expand-with-a-macro.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/expand-with-a-macro.rs
@@ -11,7 +11,7 @@
 // aux-build:expand-with-a-macro.rs
 // ignore-stage1
 
-#![feature(rustc_macro)]
+#![feature(proc_macro)]
 #![deny(warnings)]
 
 #[macro_use]
diff --git a/src/test/run-pass-fulldeps/rustc-macro/load-two.rs b/src/test/run-pass-fulldeps/proc-macro/load-two.rs
index 1500970f02d..56f9768764c 100644
--- a/src/test/run-pass-fulldeps/rustc-macro/load-two.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/load-two.rs
@@ -11,7 +11,7 @@
 // aux-build:derive-atob.rs
 // aux-build:derive-ctod.rs
 
-#![feature(rustc_macro)]
+#![feature(proc_macro)]
 
 #[macro_use]
 extern crate derive_atob;
diff --git a/src/test/run-pass-fulldeps/rustc-macro/smoke.rs b/src/test/run-pass-fulldeps/proc-macro/smoke.rs
index 588380f1140..cd7edb72644 100644
--- a/src/test/run-pass-fulldeps/rustc-macro/smoke.rs
+++ b/src/test/run-pass-fulldeps/proc-macro/smoke.rs
@@ -11,7 +11,7 @@
 // aux-build:derive-a.rs
 // ignore-stage1
 
-#![feature(rustc_macro)]
+#![feature(proc_macro)]
 
 #[macro_use]
 extern crate derive_a;
diff --git a/src/test/rustdoc/rustc-macro-crate.rs b/src/test/rustdoc/rustc-macro-crate.rs
index c8bf5b2b912..fe80a909550 100644
--- a/src/test/rustdoc/rustc-macro-crate.rs
+++ b/src/test/rustdoc/rustc-macro-crate.rs
@@ -10,15 +10,15 @@
 
 // no-prefer-dynamic
 
-#![feature(rustc_macro)]
-#![feature(rustc_macro_lib)]
-#![crate_type = "rustc-macro"]
+#![feature(proc_macro)]
+#![feature(proc_macro_lib)]
+#![crate_type = "proc-macro"]
 
-extern crate rustc_macro;
+extern crate proc_macro;
 
-use rustc_macro::TokenStream;
+use proc_macro::TokenStream;
 
-#[rustc_macro_derive(Foo)]
+#[proc_macro_derive(Foo)]
 pub fn foo(input: TokenStream) -> TokenStream {
     input
 }