Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-10 20:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #118861 - Veykril:r-a-in-tree, r=onur-ozkan

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

Some context: This came up in https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Frust-analyzer/topic/libraryfying.20match.20checking.3F where `test` and `check` behaved differently for rust-analyzer
r? `@onur-ozkan`
This commit is contained in:
bors 2024-01-05 02:53:45 +00:00
commit 7686edb3f6
6 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/mbe/Cargo.toml
View file

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

4
crates/proc-macro-srv-cli/Cargo.toml
View file

@ -14,10 +14,12 @@ proc-macro-api.workspace = true
[features] [features]
sysroot-abi = ["proc-macro-srv/sysroot-abi"] sysroot-abi = ["proc-macro-srv/sysroot-abi"]
in-rust-tree = ["proc-macro-srv/in-rust-tree", "sysroot-abi"]
[[bin]] [[bin]]
name = "rust-analyzer-proc-macro-srv" name = "rust-analyzer-proc-macro-srv"
path = "src/main.rs" path = "src/main.rs"
[lints] [lints]
workspace = true workspace = true

4
crates/proc-macro-srv-cli/src/main.rs
View file

@ -1,5 +1,9 @@
//! A standalone binary for `proc-macro-srv`. //! A standalone binary for `proc-macro-srv`.
//! Driver for proc macro server //! Driver for proc macro server
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
#[cfg(feature = "in-rust-tree")]
extern crate rustc_driver as _;
use std::io; use std::io;
fn main() -> std::io::Result<()> { fn main() -> std::io::Result<()> {

3
crates/proc-macro-srv/Cargo.toml
View file

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

3
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)… //! rustc rather than `unstable`. (Although in general ABI compatibility is still an issue)…
#![cfg(any(feature = "sysroot-abi", rust_analyzer))] #![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)] #![warn(rust_2018_idioms, unused_lifetimes)]
#![allow(unreachable_pub, internal_features)] #![allow(unreachable_pub, internal_features)]
extern crate proc_macro; extern crate proc_macro;
extern crate rustc_driver as _;
mod dylib; mod dylib;
mod server; mod server;

3
crates/rust-analyzer/src/bin/main.rs
View file

@ -5,8 +5,7 @@
#![warn(rust_2018_idioms, unused_lifetimes)] #![warn(rust_2018_idioms, unused_lifetimes)]
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))] #![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
#[cfg(feature = "in-rust-tree")] #[cfg(feature = "in-rust-tree")]
#[allow(unused_extern_crates)] extern crate rustc_driver as _;
extern crate rustc_driver;
mod logger; mod logger;
mod rustc_wrapper; mod rustc_wrapper;