Skip to content

Commit 2148bdf

Browse files
committedOct 6, 2016
rustc: Rename rustc_macro to proc_macro
This commit blanket renames the `rustc_macro` infrastructure to `proc_macro`, which reflects the general consensus of rust-lang#35900. A follow up PR to Cargo will be required to purge the `rustc-macro` name as well.
1 parent 7a26aec commit 2148bdf

File tree

86 files changed

+612
-614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+612
-614
lines changed
 

‎mk/crates.mk

+8-8
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ RUSTC_CRATES := rustc rustc_typeck rustc_mir rustc_borrowck rustc_resolve rustc_
5959
rustc_trans rustc_back rustc_llvm rustc_privacy rustc_lint \
6060
rustc_data_structures rustc_platform_intrinsics rustc_errors \
6161
rustc_plugin rustc_metadata rustc_passes rustc_save_analysis \
62-
rustc_const_eval rustc_const_math rustc_incremental rustc_macro
63-
HOST_CRATES := syntax syntax_ext proc_macro syntax_pos $(RUSTC_CRATES) rustdoc fmt_macros \
62+
rustc_const_eval rustc_const_math rustc_incremental proc_macro
63+
HOST_CRATES := syntax syntax_ext proc_macro_plugin syntax_pos $(RUSTC_CRATES) rustdoc fmt_macros \
6464
flate arena graphviz log serialize
6565
TOOLS := compiletest rustdoc rustc rustbook error_index_generator
6666

@@ -101,8 +101,8 @@ DEPS_term := std
101101
DEPS_test := std getopts term native:rust_test_helpers
102102

103103
DEPS_syntax := std term serialize log arena libc rustc_bitflags rustc_unicode rustc_errors syntax_pos
104-
DEPS_syntax_ext := syntax syntax_pos rustc_errors fmt_macros rustc_macro
105-
DEPS_proc_macro := syntax syntax_pos rustc_plugin log
104+
DEPS_syntax_ext := syntax syntax_pos rustc_errors fmt_macros proc_macro
105+
DEPS_proc_macro_plugin := syntax syntax_pos rustc_plugin log
106106
DEPS_syntax_pos := serialize
107107

108108
DEPS_rustc_const_math := std syntax log serialize
@@ -118,15 +118,15 @@ DEPS_rustc_data_structures := std log serialize libc
118118
DEPS_rustc_driver := arena flate getopts graphviz libc rustc rustc_back rustc_borrowck \
119119
rustc_typeck rustc_mir rustc_resolve log syntax serialize rustc_llvm \
120120
rustc_trans rustc_privacy rustc_lint rustc_plugin \
121-
rustc_metadata syntax_ext proc_macro \
121+
rustc_metadata syntax_ext proc_macro_plugin \
122122
rustc_passes rustc_save_analysis rustc_const_eval \
123-
rustc_incremental syntax_pos rustc_errors rustc_macro
123+
rustc_incremental syntax_pos rustc_errors proc_macro
124124
DEPS_rustc_errors := log libc serialize syntax_pos
125125
DEPS_rustc_lint := rustc log syntax syntax_pos rustc_const_eval
126126
DEPS_rustc_llvm := native:rustllvm libc std rustc_bitflags
127-
DEPS_rustc_macro := std syntax
127+
DEPS_proc_macro := std syntax
128128
DEPS_rustc_metadata := rustc syntax syntax_pos rustc_errors rustc_const_math \
129-
rustc_macro syntax_ext
129+
proc_macro syntax_ext
130130
DEPS_rustc_passes := syntax syntax_pos rustc core rustc_const_eval rustc_errors
131131
DEPS_rustc_mir := rustc syntax syntax_pos rustc_const_math rustc_const_eval rustc_bitflags
132132
DEPS_rustc_resolve := arena rustc log syntax syntax_pos rustc_errors

‎src/libproc_macro/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@ name = "proc_macro"
44
version = "0.0.0"
55

66
[lib]
7-
name = "proc_macro"
87
path = "lib.rs"
98
crate-type = ["dylib"]
109

1110
[dependencies]
12-
log = { path = "../liblog" }
13-
rustc_plugin = { path = "../librustc_plugin" }
1411
syntax = { path = "../libsyntax" }
15-
syntax_pos = { path = "../libsyntax_pos" }

0 commit comments

Comments
 (0)
Please sign in to comment.