nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 16:54:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Imply sysroot-abi feature when in-rust-tree is set

Browse Source
This commit is contained in:
Lukas Wirth 2024-01-01 14:37:33 +01:00
parent 7b41008ee0
commit 9a9ba92b28
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap/src/core/build_steps/test.rs
View File

@ -385,7 +385,7 @@ impl Step for RustAnalyzer {
"test", "test",
crate_path, crate_path,
SourceType::InTree, SourceType::InTree,
&["sysroot-abi".to_owned(), "in-rust-tree".to_owned()], &["in-rust-tree".to_owned()],
); );
cargo.allow_features(tool::RustAnalyzer::ALLOW_FEATURES); cargo.allow_features(tool::RustAnalyzer::ALLOW_FEATURES);

2
src/bootstrap/src/core/build_steps/tool.rs
View File

@ -675,7 +675,7 @@ impl Step for RustAnalyzerProcMacroSrv {
tool: "rust-analyzer-proc-macro-srv", tool: "rust-analyzer-proc-macro-srv",
mode: Mode::ToolRustc, mode: Mode::ToolRustc,
path: "src/tools/rust-analyzer/crates/proc-macro-srv-cli", path: "src/tools/rust-analyzer/crates/proc-macro-srv-cli",
extra_features: vec!["sysroot-abi".to_owned(), "in-rust-tree".to_owned()], extra_features: vec!["in-rust-tree".to_owned()],
source_type: SourceType::InTree, source_type: SourceType::InTree,
allow_features: RustAnalyzer::ALLOW_FEATURES, allow_features: RustAnalyzer::ALLOW_FEATURES,
}); });

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

@ -38,7 +38,7 @@ proc-macro-test.path = "./proc-macro-test"
[features] [features]
sysroot-abi = [] sysroot-abi = []
in-rust-tree = ["mbe/in-rust-tree"] in-rust-tree = ["mbe/in-rust-tree", "sysroot-abi"]
[lints] [lints]
workspace = true workspace = true