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

minor: Sync from downstream

crates/ide-assists/Cargo.toml

@@ -34,5 +34,8 @@ expect-test = "1.4.0"
 test-utils.workspace = true
 test-fixture.workspace = true
 
+[features]
+in-rust-tree = []
+
 [lints]
 workspace = true

crates/ide-assists/src/lib.rs

@@ -58,6 +58,8 @@
 //! See also this post:
 //! <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_context;
 #[cfg(test)]

crates/mbe/src/lib.rs

@@ -6,6 +6,8 @@
 //! The tests for this functionality live in another crate:
 //! `hir_def::macro_expansion_tests::mbe`.
 
+#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
+
 #[cfg(not(feature = "in-rust-tree"))]
 extern crate ra_ap_rustc_lexer as rustc_lexer;
 #[cfg(feature = "in-rust-tree")]

rust-version

@@ -1 +1 @@
-1b5aa96d6016bafe50e071b45d4d2e3c90fd766f
+cf24c73141a77db730f4b7fda69dcd7e8b113b51