Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit b83f487

Browse files
committed
Set the in-rust-tree` feature for all rust-analyzer{-proc-macro-srv} steps
1 parent d3d7c4b commit b83f487

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

crates/mbe/Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,8 @@ span.workspace = true
2727
[dev-dependencies]
2828
test-utils.workspace = true
2929

30+
[features]
31+
in-rust-tree = ["parser/in-rust-tree", "syntax/in-rust-tree"]
32+
3033
[lints]
31-
workspace = true
34+
workspace = true

crates/proc-macro-srv-cli/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ proc-macro-api.workspace = true
1414

1515
[features]
1616
sysroot-abi = ["proc-macro-srv/sysroot-abi"]
17+
in-rust-tree = ["proc-macro-srv/in-rust-tree"]
18+
1719

1820
[[bin]]
1921
name = "rust-analyzer-proc-macro-srv"

crates/proc-macro-srv/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ expect-test = "1.4.0"
3737
proc-macro-test.path = "./proc-macro-test"
3838

3939
[features]
40-
sysroot-abi = ["proc-macro-test/sysroot-abi"]
40+
sysroot-abi = []
41+
in-rust-tree = ["mbe/in-rust-tree"]
4142

4243
[lints]
43-
workspace = true
44+
workspace = true

crates/proc-macro-srv/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
//! rustc rather than `unstable`. (Although in general ABI compatibility is still an issue)…
1212
1313
#![cfg(any(feature = "sysroot-abi", rust_analyzer))]
14-
#![feature(proc_macro_internals, proc_macro_diagnostic, proc_macro_span)]
14+
#![feature(proc_macro_internals, proc_macro_diagnostic, proc_macro_span, rustc_private)]
1515
#![warn(rust_2018_idioms, unused_lifetimes)]
1616
#![allow(unreachable_pub, internal_features)]
1717

1818
extern crate proc_macro;
19+
extern crate rustc_driver as _;
1920

2021
mod dylib;
2122
mod server;

0 commit comments

Comments
 (0)