about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2023-06-08 12:36:18 +0200
committerGitHub <noreply@github.com>2023-06-08 12:36:18 +0200
commitc71daaac1ff63d26e84331579b5feb70cf66101d (patch)
tree0f7b4b49ef36952a494acc11a66fe7ff304567f2
parent4f2e1df29dd1090c666d9402f75d3ad5c804591c (diff)
parenta3cc503876a761871674d27ce1bb7a35fd3d9900 (diff)
downloadrust-c71daaac1ff63d26e84331579b5feb70cf66101d.tar.gz
rust-c71daaac1ff63d26e84331579b5feb70cf66101d.zip
Rollup merge of #112339 - lnicola:proc-macro-srv-feature, r=Veykril
Fix rust-analyzer proc macro server

The feature now exists on `proc-macro-srv-cli`, and without it the proc macro server will bail rigth out.

CC https://github.com/rust-lang/rust-analyzer/issues/14991
-rw-r--r--src/bootstrap/tool.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 0f0a3bb8775..962cbf758d4 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -711,7 +711,7 @@ impl Step for RustAnalyzerProcMacroSrv {
             tool: "rust-analyzer-proc-macro-srv",
             mode: Mode::ToolStd,
             path: "src/tools/rust-analyzer/crates/proc-macro-srv-cli",
-            extra_features: vec!["proc-macro-srv/sysroot-abi".to_owned()],
+            extra_features: vec!["sysroot-abi".to_owned()],
             is_optional_tool: false,
             source_type: SourceType::InTree,
             allow_features: RustAnalyzer::ALLOW_FEATURES,