Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #18267 - lnicola:sync-from-rust, r=lnicola

Browse source 
minor: Sync from downstream
This commit is contained in:
bors 2024-10-08 11:27:18 +00:00
commit efaf8bd5de
4 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crates/ide-assists/Cargo.toml
View file

@ -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

2
crates/ide-assists/src/lib.rs
View file

@ -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)]

2
crates/mbe/src/lib.rs
View file

@ -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")]

2
rust-version
View file

@ -1 +1 @@
1b5aa96d6016bafe50e071b45d4d2e3c90fd766f cf24c73141a77db730f4b7fda69dcd7e8b113b51