use path dependency instead of rustc_private

rust-lang · Nov 3, 2023 · 23f9077 · 23f9077
1 parent 520aad1
commit 23f9077
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/src/tools/rust-analyzer/crates/rustc-dependencies/Cargo.toml b/src/tools/rust-analyzer/crates/rustc-dependencies/Cargo.toml
@@ -16,5 +16,10 @@ ra-ap-rustc_parse_format = { version = "0.14.0", default-features = false }
 ra-ap-rustc_index = { version = "0.14.0", default-features = false }
 ra-ap-rustc_abi = { version = "0.14.0", default-features = false }
 
+in-tree-rustc_lexer = { path = "../../../../compiler/rustc_lexer", package = "rustc_lexer" }
+in-tree-rustc_parse_format = { path = "../../../../compiler/rustc_parse_format", package = "rustc_parse_format", default-features = false }
+in-tree-rustc_index = { path = "../../../../compiler/rustc_index", package = "rustc_index", default-features = false }
+in-tree-rustc_abi = { path = "../../../../compiler/rustc_abi", package = "rustc_abi", default-features = false }
+
 [features]
 in-rust-tree = []
diff --git a/src/tools/rust-analyzer/crates/rustc-dependencies/src/lib.rs b/src/tools/rust-analyzer/crates/rustc-dependencies/src/lib.rs
@@ -1,48 +1,34 @@
 //! A wrapper around rustc internal crates, which enables switching between compiler provided
 //! ones and stable ones published in crates.io
 
-#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
-
-#[cfg(feature = "in-rust-tree")]
-extern crate rustc_lexer;
-
 pub mod lexer {
     #[cfg(not(feature = "in-rust-tree"))]
     pub use ::ra_ap_rustc_lexer::*;
 
     #[cfg(feature = "in-rust-tree")]
-    pub use ::rustc_lexer::*;
+    pub use ::in_tree_rustc_lexer::*;
 }
 
-#[cfg(feature = "in-rust-tree")]
-extern crate rustc_parse_format;
-
 pub mod parse_format {
     #[cfg(not(feature = "in-rust-tree"))]
     pub use ::ra_ap_rustc_parse_format::*;
 
     #[cfg(feature = "in-rust-tree")]
-    pub use ::rustc_parse_format::*;
+    pub use ::in_tree_rustc_parse_format::*;
 }
 
-#[cfg(feature = "in-rust-tree")]
-extern crate rustc_abi;
-
 pub mod abi {
     #[cfg(not(feature = "in-rust-tree"))]
     pub use ::ra_ap_rustc_abi::*;
 
     #[cfg(feature = "in-rust-tree")]
-    pub use ::rustc_abi::*;
+    pub use ::in_tree_rustc_abi::*;
 }
 
-#[cfg(feature = "in-rust-tree")]
-extern crate rustc_index;
-
 pub mod index {
     #[cfg(not(feature = "in-rust-tree"))]
     pub use ::ra_ap_rustc_index::*;
 
     #[cfg(feature = "in-rust-tree")]
-    pub use ::rustc_index::*;
+    pub use ::in_tree_rustc_index::*;
 }