Skip to content

Commit 9a9ba92

Browse files
committed
Imply sysroot-abi feature when in-rust-tree is set
1 parent 7b41008 commit 9a9ba92

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/bootstrap/src/core/build_steps/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ impl Step for RustAnalyzer {
385385
"test",
386386
crate_path,
387387
SourceType::InTree,
388-
&["sysroot-abi".to_owned(), "in-rust-tree".to_owned()],
388+
&["in-rust-tree".to_owned()],
389389
);
390390
cargo.allow_features(tool::RustAnalyzer::ALLOW_FEATURES);
391391

src/bootstrap/src/core/build_steps/tool.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ impl Step for RustAnalyzerProcMacroSrv {
675675
tool: "rust-analyzer-proc-macro-srv",
676676
mode: Mode::ToolRustc,
677677
path: "src/tools/rust-analyzer/crates/proc-macro-srv-cli",
678-
extra_features: vec!["sysroot-abi".to_owned(), "in-rust-tree".to_owned()],
678+
extra_features: vec!["in-rust-tree".to_owned()],
679679
source_type: SourceType::InTree,
680680
allow_features: RustAnalyzer::ALLOW_FEATURES,
681681
});

src/tools/rust-analyzer/crates/proc-macro-srv/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ proc-macro-test.path = "./proc-macro-test"
3838

3939
[features]
4040
sysroot-abi = []
41-
in-rust-tree = ["mbe/in-rust-tree"]
41+
in-rust-tree = ["mbe/in-rust-tree", "sysroot-abi"]
4242

4343
[lints]
4444
workspace = true

0 commit comments

Comments
 (0)