Fix proc-macro-test-impl building without any proc-macros

rust-lang · Dec 21, 2023 · ca957f4 · ca957f4
1 parent 9197b54
commit ca957f4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/proc-macro-srv/proc-macro-test/Cargo.toml b/crates/proc-macro-srv/proc-macro-test/Cargo.toml
@@ -12,10 +12,8 @@ doctest = false
 [build-dependencies]
 cargo_metadata = "0.18.1"
 
-proc-macro-test-impl = { path = "imp", version = "0.0.0" }
-
 # local deps
-toolchain.path = "../../toolchain"
+toolchain = { path = "../../toolchain", version = "0.0.0" }
 
 [features]
-sysroot-abi = ["proc-macro-test-impl/sysroot-abi"]
+sysroot-abi = []
diff --git a/crates/proc-macro-srv/proc-macro-test/build.rs b/crates/proc-macro-srv/proc-macro-test/build.rs
@@ -70,6 +70,9 @@ fn main() {
         // instance to use the same target directory.
         .arg("--target-dir")
         .arg(&target_dir);
+    if cfg!(feature = "sysroot-abi") {
+        cmd.args(["--features", "sysroot-abi"]);
+    }
 
     if let Ok(target) = std::env::var("TARGET") {
         cmd.args(["--target", &target]);

diff --git a/crates/proc-macro-srv/src/proc_macros.rs b/crates/proc-macro-srv/src/proc_macros.rs
@@ -97,7 +97,7 @@ impl ProcMacros {
             }
         }
 
-        Err(bridge::PanicMessage::String("Nothing to expand".to_string()).into())
+        Err(bridge::PanicMessage::String(format!("proc-macro `{macro_name}` is missing")).into())
     }
 
     pub(crate) fn list_macros(&self) -> Vec<(String, ProcMacroKind)> {
-Original file line number
+Diff line change
@@ Expand Up / @@ -97,7 +97,7 @@ impl ProcMacros { @@
                 }
             }
-            Err(bridge::PanicMessage::String("Nothing to expand".to_string()).into())
+            Err(bridge::PanicMessage::String(format!("proc-macro `{macro_name}` is missing")).into())
         }
         pub(crate) fn list_macros(&self) -> Vec<(String, ProcMacroKind)> {
@@ Expand Down @@