mirror of
https://github.com/rust-lang/rust-analyzer
synced 2025-01-10 20:28:51 +00:00
Auto merge of #118861 - Veykril:r-a-in-tree, r=onur-ozkan
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:
commit
7686edb3f6
6 changed files with 16 additions and 6 deletions
|
@ -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
|
||||
|
|
|
@ -14,10 +14,12 @@ proc-macro-api.workspace = true
|
|||
|
||||
[features]
|
||||
sysroot-abi = ["proc-macro-srv/sysroot-abi"]
|
||||
in-rust-tree = ["proc-macro-srv/in-rust-tree", "sysroot-abi"]
|
||||
|
||||
|
||||
[[bin]]
|
||||
name = "rust-analyzer-proc-macro-srv"
|
||||
path = "src/main.rs"
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
workspace = true
|
||||
|
|
|
@ -1,5 +1,9 @@
|
|||
//! A standalone binary for `proc-macro-srv`.
|
||||
//! 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;
|
||||
|
||||
fn main() -> std::io::Result<()> {
|
||||
|
|
|
@ -38,6 +38,7 @@ proc-macro-test.path = "./proc-macro-test"
|
|||
|
||||
[features]
|
||||
sysroot-abi = ["proc-macro-test/sysroot-abi"]
|
||||
in-rust-tree = ["mbe/in-rust-tree", "sysroot-abi"]
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
workspace = true
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -5,8 +5,7 @@
|
|||
#![warn(rust_2018_idioms, unused_lifetimes)]
|
||||
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
|
||||
#[cfg(feature = "in-rust-tree")]
|
||||
#[allow(unused_extern_crates)]
|
||||
extern crate rustc_driver;
|
||||
extern crate rustc_driver as _;
|
||||
|
||||
mod logger;
|
||||
mod rustc_wrapper;
|
||||
|
|
Loading…
Reference in a new issue