diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-10-03 09:49:39 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-10-06 11:07:23 -0700 |
| commit | 2148bdfcc7ea7b9614d8cbe596cbe7bb75b57cd1 (patch) | |
| tree | 4a88c4f26d3a898cb9ac26aa6a06fd074253d5a3 /src/test/run-make | |
| parent | 7a26aeca77bcf334747eddb630e3b9475149b7f5 (diff) | |
| download | rust-2148bdfcc7ea7b9614d8cbe596cbe7bb75b57cd1.tar.gz rust-2148bdfcc7ea7b9614d8cbe596cbe7bb75b57cd1.zip | |
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.
Diffstat (limited to 'src/test/run-make')
| -rw-r--r-- | src/test/run-make/rustc-macro-dep-files/Makefile | 2 | ||||
| -rw-r--r-- | src/test/run-make/rustc-macro-dep-files/bar.rs | 2 | ||||
| -rw-r--r-- | src/test/run-make/rustc-macro-dep-files/foo.rs | 12 |
3 files changed, 8 insertions, 8 deletions
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;")); |