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.

5 files changed, 20 insertions, 20 deletions

diff --git a/src/librustc_metadata/Cargo.toml b/src/librustc_metadata/Cargo.toml
index 680d55955bb..6f7f03ca216 100644
--- a/src/librustc_metadata/Cargo.toml
+++ b/src/librustc_metadata/Cargo.toml
@@ -11,13 +11,13 @@ crate-type = ["dylib"]
 [dependencies]
 flate = { path = "../libflate" }
 log = { path = "../liblog" }
+proc_macro = { path = "../libproc_macro" }
 rustc = { path = "../librustc" }
 rustc_back = { path = "../librustc_back" }
 rustc_const_math = { path = "../librustc_const_math" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_llvm = { path = "../librustc_llvm" }
-rustc_macro = { path = "../librustc_macro" }
 serialize = { path = "../libserialize" }
 syntax = { path = "../libsyntax" }
 syntax_ext = { path = "../libsyntax_ext" }
diff --git a/src/librustc_metadata/creader.rs b/src/librustc_metadata/creader.rs
index 0c7f6204438..a57207dc089 100644
--- a/src/librustc_metadata/creader.rs
+++ b/src/librustc_metadata/creader.rs
@@ -311,7 +311,7 @@ impl<'a> CrateReader<'a> {
         let cnum_map = self.resolve_crate_deps(root, &crate_root, &metadata, cnum, span);
 
         if crate_root.macro_derive_registrar.is_some() {
-            self.sess.span_err(span, "crates of the `rustc-macro` crate type \
+            self.sess.span_err(span, "crates of the `proc-macro` crate type \
                                       cannot be linked at runtime");
         }
 
@@ -609,11 +609,11 @@ impl<'a> CrateReader<'a> {
         match root.macro_derive_registrar {
             Some(id) => ret.custom_derive_registrar = Some(id),
 
-            // If this crate is not a rustc-macro crate then we might be able to
+            // If this crate is not a proc-macro crate then we might be able to
             // register it with the local crate store to prevent loading the
             // metadata twice.
             //
-            // If it's a rustc-macro crate, though, then we definitely don't
+            // If it's a proc-macro crate, though, then we definitely don't
             // want to register it with the local crate store as we're just
             // going to use it as we would a plugin.
             None => {
@@ -625,11 +625,11 @@ impl<'a> CrateReader<'a> {
         self.cstore.add_used_for_derive_macros(item);
         ret.dylib = ekrate.dylib.clone();
         if ret.dylib.is_none() {
-            span_bug!(item.span, "rustc-macro crate not dylib");
+            span_bug!(item.span, "proc-macro crate not dylib");
         }
 
         if ekrate.target_only {
-            let message = format!("rustc-macro crate is not available for \
+            let message = format!("proc-macro crate is not available for \
                                    triple `{}` (only found {})",
                                   config::host_triple(),
                                   self.sess.opts.target_triple);
@@ -804,7 +804,7 @@ impl<'a> CrateReader<'a> {
             match *ct {
                 config::CrateTypeExecutable => need_exe_alloc = true,
                 config::CrateTypeDylib |
-                config::CrateTypeRustcMacro |
+                config::CrateTypeProcMacro |
                 config::CrateTypeCdylib |
                 config::CrateTypeStaticlib => need_lib_alloc = true,
                 config::CrateTypeRlib => {}
diff --git a/src/librustc_metadata/encoder.rs b/src/librustc_metadata/encoder.rs
index 4d18462848e..01b106682bb 100644
--- a/src/librustc_metadata/encoder.rs
+++ b/src/librustc_metadata/encoder.rs
@@ -23,7 +23,7 @@ use rustc::traits::specialization_graph;
 use rustc::ty::{self, Ty, TyCtxt};
 
 use rustc::mir::mir_map::MirMap;
-use rustc::session::config::{self, CrateTypeRustcMacro};
+use rustc::session::config::{self, CrateTypeProcMacro};
 use rustc::util::nodemap::{FnvHashMap, NodeSet};
 
 use rustc_serialize::{Encodable, Encoder, SpecializedEncoder, opaque};
@@ -1286,7 +1286,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
 
         let tcx = self.tcx;
         let link_meta = self.link_meta;
-        let is_rustc_macro = tcx.sess.crate_types.borrow().contains(&CrateTypeRustcMacro);
+        let is_proc_macro = tcx.sess.crate_types.borrow().contains(&CrateTypeProcMacro);
         let root = self.lazy(&CrateRoot {
             rustc_version: rustc_version(),
             name: link_meta.crate_name.clone(),
@@ -1297,7 +1297,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
             plugin_registrar_fn: tcx.sess.plugin_registrar_fn.get().map(|id| {
                 tcx.map.local_def_id(id).index
             }),
-            macro_derive_registrar: if is_rustc_macro {
+            macro_derive_registrar: if is_proc_macro {
                 let id = tcx.sess.derive_registrar_fn.get().unwrap();
                 Some(tcx.map.local_def_id(id).index)
             } else {
diff --git a/src/librustc_metadata/lib.rs b/src/librustc_metadata/lib.rs
index 4fc5a46762d..acaafb35425 100644
--- a/src/librustc_metadata/lib.rs
+++ b/src/librustc_metadata/lib.rs
@@ -17,15 +17,15 @@
        html_root_url = "https://doc.rust-lang.org/nightly/")]
 #![cfg_attr(not(stage0), deny(warnings))]
 
+#![feature(box_patterns)]
 #![feature(conservative_impl_trait)]
 #![feature(core_intrinsics)]
-#![feature(box_patterns)]
 #![feature(dotdot_in_tuple_patterns)]
+#![feature(proc_macro_internals)]
+#![feature(proc_macro_lib)]
 #![feature(question_mark)]
 #![feature(quote)]
 #![feature(rustc_diagnostic_macros)]
-#![feature(rustc_macro_lib)]
-#![feature(rustc_macro_internals)]
 #![feature(rustc_private)]
 #![feature(specialization)]
 #![feature(staged_api)]
@@ -37,14 +37,14 @@ extern crate flate;
 extern crate serialize as rustc_serialize; // used by deriving
 extern crate rustc_errors as errors;
 extern crate syntax_ext;
+extern crate proc_macro;
 
 #[macro_use]
 extern crate rustc;
-extern crate rustc_data_structures;
 extern crate rustc_back;
-extern crate rustc_llvm;
-extern crate rustc_macro;
 extern crate rustc_const_math;
+extern crate rustc_data_structures;
+extern crate rustc_llvm;
 
 mod diagnostics;
 
diff --git a/src/librustc_metadata/macro_import.rs b/src/librustc_metadata/macro_import.rs
index 385f582e2d3..7cd03b2d5b9 100644
--- a/src/librustc_metadata/macro_import.rs
+++ b/src/librustc_metadata/macro_import.rs
@@ -17,13 +17,13 @@ use std::mem;
 
 use creader::{CrateLoader, Macros};
 
+use proc_macro::TokenStream;
+use proc_macro::__internal::Registry;
 use rustc::hir::def_id::DefIndex;
 use rustc::middle::cstore::{LoadedMacro, LoadedMacroKind};
 use rustc::session::Session;
 use rustc::util::nodemap::FnvHashMap;
 use rustc_back::dynamic_lib::DynamicLibrary;
-use rustc_macro::TokenStream;
-use rustc_macro::__internal::Registry;
 use syntax::ast;
 use syntax::attr;
 use syntax::parse::token;
@@ -145,13 +145,13 @@ impl<'a> CrateLoader<'a> {
             assert_eq!(ret.len(), 0);
 
             if let ImportSelection::Some(..) = import {
-                self.sess.span_err(vi.span, "`rustc-macro` crates cannot be \
+                self.sess.span_err(vi.span, "`proc-macro` crates cannot be \
                                              selectively imported from, must \
                                              use `#[macro_use]`");
             }
 
             if reexport.len() > 0 {
-                self.sess.span_err(vi.span, "`rustc-macro` crates cannot be \
+                self.sess.span_err(vi.span, "`proc-macro` crates cannot be \
                                              reexported from");
             }