user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set the in-rust-tree` feature for all rust-analyzer{-proc-macro-srv} steps

Browse source
This commit is contained in:
Lukas Wirth 2024-01-04 11:02:20 +01:00
parent 090d5eac72
commit 7b41008ee0
7 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bootstrap/src/core/build_steps/check.rs
View file

@ -386,7 +386,7 @@ impl Step for RustAnalyzer {
cargo_subcommand(builder.kind),
"src/tools/rust-analyzer",
SourceType::InTree,
&["rust-analyzer/in-rust-tree".to_owned()],
&["in-rust-tree".to_owned()],
);
cargo.allow_features(crate::core::build_steps::tool::RustAnalyzer::ALLOW_FEATURES);

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

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

6
src/bootstrap/src/core/build_steps/tool.rs
View file

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

5
src/tools/rust-analyzer/crates/mbe/Cargo.toml
View file

@ -27,5 +27,8 @@ span.workspace = true
[dev-dependencies]
test-utils.workspace = true
[features]
in-rust-tree = ["parser/in-rust-tree", "syntax/in-rust-tree"]
[lints]
workspace = true
workspace = true

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

@ -14,6 +14,8 @@ proc-macro-api.workspace = true
[features]
sysroot-abi = ["proc-macro-srv/sysroot-abi"]
in-rust-tree = ["proc-macro-srv/in-rust-tree"]
[[bin]]
name = "rust-analyzer-proc-macro-srv"

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

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

3
src/tools/rust-analyzer/crates/proc-macro-srv/src/lib.rs
View file

@ -11,11 +11,12 @@
//! rustc rather than `unstable`. (Although in general ABI compatibility is still an issue)…
#![cfg(any(feature = "sysroot-abi", rust_analyzer))]
#![feature(proc_macro_internals, proc_macro_diagnostic, proc_macro_span)]
#![feature(proc_macro_internals, proc_macro_diagnostic, proc_macro_span, rustc_private)]
#![warn(rust_2018_idioms, unused_lifetimes)]
#![allow(unreachable_pub, internal_features)]
extern crate proc_macro;
extern crate rustc_driver as _;
mod dylib;
mod server;