about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorJeffrey Seyfried <jeffrey.seyfried@gmail.com>2017-03-17 23:41:09 +0000
committerJeffrey Seyfried <jeffrey.seyfried@gmail.com>2017-06-26 02:06:26 +0000
commite42836b2085233323339bacb636ecf9c28e8422e (patch)
treec43855deb6274dce6bbafb7efb75bd9ac8b95f97 /src/tools
parent7d41674b175cdb3452e042ef6f37141bc3788f8b (diff)
Implement `quote!` and other `proc_macro` API.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/tidy/src/cargo.rs8
-rw-r--r--src/tools/tidy/src/features.rs2
2 files changed, 1 insertions, 9 deletions
diff --git a/src/tools/tidy/src/cargo.rs b/src/tools/tidy/src/cargo.rs
index c8c6cb0ee6b..f40fea60f40 100644
--- a/src/tools/tidy/src/cargo.rs
+++ b/src/tools/tidy/src/cargo.rs
@@ -91,14 +91,6 @@ fn verify(tomlfile: &Path, libfile: &Path, bad: &mut bool) {
             continue
         }
 
-        // 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
-        }
-
         if !librs.contains(&format!("extern crate {}", krate)) {
             tidy_error!(bad, "{} doesn't have `extern crate {}`, but Cargo.toml \
                               depends on it", libfile.display(), krate);
diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs
index 722fc2b317e..d98c6932c51 100644
--- a/src/tools/tidy/src/features.rs
+++ b/src/tools/tidy/src/features.rs
@@ -245,7 +245,7 @@ fn get_and_check_lib_features(base_src_path: &Path,
                     let mut err = |msg: &str| {
                         tidy_error!(bad, "{}:{}: {}", file.display(), line, msg);
                     };
-                    if lang_features.contains_key(name) {
+                    if lang_features.contains_key(name) && feature_name != "proc_macro" {
                         err("duplicating a lang feature");
                     }
                     if let Some(ref s) = lib_features.get(name) {