mirror of
https://github.com/rust-lang/rust-analyzer
synced 2024-12-26 13:03:31 +00:00
Merge from rust-lang/rust
This commit is contained in:
commit
b9e58a2379
3 changed files with 7 additions and 0 deletions
|
@ -34,5 +34,8 @@ expect-test = "1.4.0"
|
||||||
test-utils.workspace = true
|
test-utils.workspace = true
|
||||||
test-fixture.workspace = true
|
test-fixture.workspace = true
|
||||||
|
|
||||||
|
[features]
|
||||||
|
in-rust-tree = []
|
||||||
|
|
||||||
[lints]
|
[lints]
|
||||||
workspace = true
|
workspace = true
|
||||||
|
|
|
@ -58,6 +58,8 @@
|
||||||
//! See also this post:
|
//! See also this post:
|
||||||
//! <https://rust-analyzer.github.io/blog/2020/09/28/how-to-make-a-light-bulb.html>
|
//! <https://rust-analyzer.github.io/blog/2020/09/28/how-to-make-a-light-bulb.html>
|
||||||
|
|
||||||
|
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
|
||||||
|
|
||||||
mod assist_config;
|
mod assist_config;
|
||||||
mod assist_context;
|
mod assist_context;
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
|
|
@ -6,6 +6,8 @@
|
||||||
//! The tests for this functionality live in another crate:
|
//! The tests for this functionality live in another crate:
|
||||||
//! `hir_def::macro_expansion_tests::mbe`.
|
//! `hir_def::macro_expansion_tests::mbe`.
|
||||||
|
|
||||||
|
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
|
||||||
|
|
||||||
#[cfg(not(feature = "in-rust-tree"))]
|
#[cfg(not(feature = "in-rust-tree"))]
|
||||||
extern crate ra_ap_rustc_lexer as rustc_lexer;
|
extern crate ra_ap_rustc_lexer as rustc_lexer;
|
||||||
#[cfg(feature = "in-rust-tree")]
|
#[cfg(feature = "in-rust-tree")]
|
||||||
|
|
Loading…
Reference in a new issue