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.

2 files changed, 6 insertions, 4 deletions

diff --git a/src/tools/cargotest/main.rs b/src/tools/cargotest/main.rs
index 354cce69127..633ff6271b7 100644
--- a/src/tools/cargotest/main.rs
+++ b/src/tools/cargotest/main.rs
@@ -24,7 +24,7 @@ struct Test {
 const TEST_REPOS: &'static [Test] = &[Test {
                                           name: "cargo",
                                           repo: "https://github.com/rust-lang/cargo",
-                                          sha: "d8936af1390ab0844e5e68b459214f2529c9f647",
+                                          sha: "d3bad1ab29efae414e9b4c24534b2d02b3a59782",
                                           lock: None,
                                       },
                                       Test {
diff --git a/src/tools/tidy/src/cargo.rs b/src/tools/tidy/src/cargo.rs
index 4932fd5147a..a7784e65c5b 100644
--- a/src/tools/tidy/src/cargo.rs
+++ b/src/tools/tidy/src/cargo.rs
@@ -88,9 +88,11 @@ fn verify(tomlfile: &Path, libfile: &Path, bad: &mut bool) {
             continue
         }
 
-        // We want the compiler to depend on the proc_macro crate so that it is built and
-        // included in the end, but we don't want to actually use it in the compiler.
-        if toml.contains("name = \"rustc_driver\"") && krate == "proc_macro" {
+        // We want the compiler to depend on the proc_macro_plugin crate so
+        // that it is built and included in the end, but we don't want to
+        // actually use it in the compiler.
+        if toml.contains("name = \"rustc_driver\"") &&
+           krate == "proc_macro_plugin" {
             continue
         }