From b97ab00bd404bc5e6fb3eb92a123062a02ab7f23 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Mon, 8 Jan 2024 15:24:46 +0100
Subject: [PATCH 1/3] Split out rustc_lexer from rustc_dependencies

---
 Cargo.lock                           |  5 ++---
 Cargo.toml                           |  2 ++
 crates/parser/Cargo.toml             |  7 +++----
 crates/parser/src/lexed_str.rs       |  2 --
 crates/parser/src/lib.rs             |  5 +++++
 crates/rustc-dependencies/Cargo.toml |  3 +--
 crates/rustc-dependencies/src/lib.rs | 11 -----------
 crates/syntax/Cargo.toml             |  6 +++---
 crates/syntax/src/ast/token_ext.rs   |  2 --
 crates/syntax/src/lib.rs             |  5 +++++
 crates/syntax/src/validation.rs      |  2 +-
 11 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6670e92f51..98ae47640f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1196,7 +1196,7 @@ dependencies = [
  "drop_bomb",
  "expect-test",
  "limit",
- "rustc-dependencies",
+ "ra-ap-rustc_lexer",
  "sourcegen",
  "stdx",
 ]
@@ -1605,7 +1605,6 @@ version = "0.0.0"
 dependencies = [
  "ra-ap-rustc_abi",
  "ra-ap-rustc_index",
- "ra-ap-rustc_lexer",
  "ra-ap-rustc_parse_format",
 ]
 
@@ -1808,9 +1807,9 @@ dependencies = [
  "proc-macro2",
  "profile",
  "quote",
+ "ra-ap-rustc_lexer",
  "rayon",
  "rowan",
- "rustc-dependencies",
  "rustc-hash",
  "smol_str",
  "sourcegen",
diff --git a/Cargo.toml b/Cargo.toml
index 4ee8064b5e..296ccb2dfa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -80,6 +80,8 @@ vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
 vfs = { path = "./crates/vfs", version = "0.0.0" }
 rustc-dependencies = { path = "./crates/rustc-dependencies", version = "0.0.0" }
 
+ra-ap-rustc_lexer = "0.21.0"
+
 # local crates that aren't published to crates.io. These should not have versions.
 sourcegen = { path = "./crates/sourcegen" }
 test-fixture = { path = "./crates/test-fixture" }
diff --git a/crates/parser/Cargo.toml b/crates/parser/Cargo.toml
index 0c63484634..e74b340126 100644
--- a/crates/parser/Cargo.toml
+++ b/crates/parser/Cargo.toml
@@ -13,8 +13,7 @@ doctest = false
 
 [dependencies]
 drop_bomb = "0.1.5"
-rustc-dependencies.workspace = true
-
+ra-ap-rustc_lexer.workspace = true
 limit.workspace = true
 
 [dev-dependencies]
@@ -24,7 +23,7 @@ stdx.workspace = true
 sourcegen.workspace = true
 
 [features]
-in-rust-tree = ["rustc-dependencies/in-rust-tree"]
+in-rust-tree = []
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/crates/parser/src/lexed_str.rs b/crates/parser/src/lexed_str.rs
index b9e7566fdf..f47ec49df1 100644
--- a/crates/parser/src/lexed_str.rs
+++ b/crates/parser/src/lexed_str.rs
@@ -8,8 +8,6 @@
 //! Note that these tokens, unlike the tokens we feed into the parser, do
 //! include info about comments and whitespace.
 
-use rustc_dependencies::lexer as rustc_lexer;
-
 use std::ops;
 
 use rustc_lexer::unescape::{EscapeError, Mode};
diff --git a/crates/parser/src/lib.rs b/crates/parser/src/lib.rs
index d9b3f46f20..ed0aec3cab 100644
--- a/crates/parser/src/lib.rs
+++ b/crates/parser/src/lib.rs
@@ -21,6 +21,11 @@
 #![allow(rustdoc::private_intra_doc_links)]
 #![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")]
+extern crate rustc_lexer;
+
 mod lexed_str;
 mod token_set;
 mod syntax_kind;
diff --git a/crates/rustc-dependencies/Cargo.toml b/crates/rustc-dependencies/Cargo.toml
index 0bf04301df..ae8abc6cc7 100644
--- a/crates/rustc-dependencies/Cargo.toml
+++ b/crates/rustc-dependencies/Cargo.toml
@@ -11,7 +11,6 @@ authors.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ra-ap-rustc_lexer = { version = "0.21.0" }
 ra-ap-rustc_parse_format = { version = "0.21.0", default-features = false }
 ra-ap-rustc_index = { version = "0.21.0", default-features = false }
 ra-ap-rustc_abi = { version = "0.21.0", default-features = false }
@@ -20,4 +19,4 @@ ra-ap-rustc_abi = { version = "0.21.0", default-features = false }
 in-rust-tree = []
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/crates/rustc-dependencies/src/lib.rs b/crates/rustc-dependencies/src/lib.rs
index 13fcbc4919..d3f386fe08 100644
--- a/crates/rustc-dependencies/src/lib.rs
+++ b/crates/rustc-dependencies/src/lib.rs
@@ -3,17 +3,6 @@
 
 #![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::*;
-}
-
 #[cfg(feature = "in-rust-tree")]
 extern crate rustc_parse_format;
 
diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml
index 40a93fec2c..9f78614bba 100644
--- a/crates/syntax/Cargo.toml
+++ b/crates/syntax/Cargo.toml
@@ -23,7 +23,7 @@ indexmap.workspace = true
 smol_str.workspace = true
 triomphe.workspace = true
 
-rustc-dependencies.workspace = true
+ra-ap-rustc_lexer.workspace = true
 
 parser.workspace = true
 profile.workspace = true
@@ -41,7 +41,7 @@ test-utils.workspace = true
 sourcegen.workspace = true
 
 [features]
-in-rust-tree = ["rustc-dependencies/in-rust-tree"]
+in-rust-tree = []
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/crates/syntax/src/ast/token_ext.rs b/crates/syntax/src/ast/token_ext.rs
index d5d565a015..ede392fc62 100644
--- a/crates/syntax/src/ast/token_ext.rs
+++ b/crates/syntax/src/ast/token_ext.rs
@@ -2,8 +2,6 @@
 
 use std::borrow::Cow;
 
-use rustc_dependencies::lexer as rustc_lexer;
-
 use rustc_lexer::unescape::{
     unescape_byte, unescape_c_string, unescape_char, unescape_literal, CStrUnit, Mode,
 };
diff --git a/crates/syntax/src/lib.rs b/crates/syntax/src/lib.rs
index d600698040..1b41596a5f 100644
--- a/crates/syntax/src/lib.rs
+++ b/crates/syntax/src/lib.rs
@@ -22,6 +22,11 @@
 #![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
 #![warn(rust_2018_idioms, unused_lifetimes)]
 
+#[cfg(not(feature = "in-rust-tree"))]
+extern crate ra_ap_rustc_lexer as rustc_lexer;
+#[cfg(feature = "in-rust-tree")]
+extern crate rustc_lexer;
+
 #[allow(unused)]
 macro_rules! eprintln {
     ($($tt:tt)*) => { stdx::eprintln!($($tt)*) };
diff --git a/crates/syntax/src/validation.rs b/crates/syntax/src/validation.rs
index eabbda2c39..6c6916c585 100644
--- a/crates/syntax/src/validation.rs
+++ b/crates/syntax/src/validation.rs
@@ -5,7 +5,7 @@
 mod block;
 
 use rowan::Direction;
-use rustc_dependencies::lexer::unescape::{self, unescape_literal, Mode};
+use rustc_lexer::unescape::{self, unescape_literal, Mode};
 
 use crate::{
     algo,

From e25e0dd0adb7bc4b402872af8414e7d99e0adec0 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Mon, 8 Jan 2024 15:30:26 +0100
Subject: [PATCH 2/3] Split out rustc_parse_format from rustc_dependencies

---
 Cargo.lock                            |  2 +-
 Cargo.toml                            |  3 ++-
 crates/hir-def/Cargo.toml             |  3 ++-
 crates/hir-def/src/hir/format_args.rs |  2 +-
 crates/hir-def/src/lib.rs             |  9 +++++----
 crates/rustc-dependencies/Cargo.toml  |  1 -
 crates/rustc-dependencies/src/lib.rs  | 11 -----------
 7 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 98ae47640f..547940c91d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -513,6 +513,7 @@ dependencies = [
  "mbe",
  "once_cell",
  "profile",
+ "ra-ap-rustc_parse_format",
  "rustc-dependencies",
  "rustc-hash",
  "smallvec",
@@ -1605,7 +1606,6 @@ version = "0.0.0"
 dependencies = [
  "ra-ap-rustc_abi",
  "ra-ap-rustc_index",
- "ra-ap-rustc_parse_format",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 296ccb2dfa..1734c55a3f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -80,7 +80,8 @@ vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
 vfs = { path = "./crates/vfs", version = "0.0.0" }
 rustc-dependencies = { path = "./crates/rustc-dependencies", version = "0.0.0" }
 
-ra-ap-rustc_lexer = "0.21.0"
+ra-ap-rustc_lexer = { version = "0.21.0", default-features = false }
+ra-ap-rustc_parse_format = { version = "0.21.0", default-features = false }
 
 # local crates that aren't published to crates.io. These should not have versions.
 sourcegen = { path = "./crates/sourcegen" }
diff --git a/crates/hir-def/Cargo.toml b/crates/hir-def/Cargo.toml
index 5933d30040..fea7d81c6a 100644
--- a/crates/hir-def/Cargo.toml
+++ b/crates/hir-def/Cargo.toml
@@ -29,6 +29,7 @@ smallvec.workspace = true
 hashbrown.workspace = true
 triomphe.workspace = true
 
+ra-ap-rustc_parse_format.workspace = true
 rustc-dependencies.workspace = true
 
 # local deps
@@ -56,4 +57,4 @@ test-fixture.workspace = true
 in-rust-tree = ["rustc-dependencies/in-rust-tree"]
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/crates/hir-def/src/hir/format_args.rs b/crates/hir-def/src/hir/format_args.rs
index 7fc33abc7c..c0d1738b50 100644
--- a/crates/hir-def/src/hir/format_args.rs
+++ b/crates/hir-def/src/hir/format_args.rs
@@ -2,7 +2,7 @@
 use std::mem;
 
 use hir_expand::name::Name;
-use rustc_dependencies::parse_format as parse;
+use rustc_parse_format as parse;
 use stdx::TupleExt;
 use syntax::{
     ast::{self, IsString},
diff --git a/crates/hir-def/src/lib.rs b/crates/hir-def/src/lib.rs
index 250d7b677b..9d042ea935 100644
--- a/crates/hir-def/src/lib.rs
+++ b/crates/hir-def/src/lib.rs
@@ -10,10 +10,11 @@
 #![warn(rust_2018_idioms, unused_lifetimes)]
 #![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
 
-#[allow(unused)]
-macro_rules! eprintln {
-    ($($tt:tt)*) => { stdx::eprintln!($($tt)*) };
-}
+#[cfg(feature = "in-rust-tree")]
+extern crate rustc_parse_format;
+
+#[cfg(not(feature = "in-rust-tree"))]
+extern crate ra_ap_rustc_parse_format as rustc_parse_format;
 
 pub mod db;
 
diff --git a/crates/rustc-dependencies/Cargo.toml b/crates/rustc-dependencies/Cargo.toml
index ae8abc6cc7..a14cc60860 100644
--- a/crates/rustc-dependencies/Cargo.toml
+++ b/crates/rustc-dependencies/Cargo.toml
@@ -11,7 +11,6 @@ authors.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ra-ap-rustc_parse_format = { version = "0.21.0", default-features = false }
 ra-ap-rustc_index = { version = "0.21.0", default-features = false }
 ra-ap-rustc_abi = { version = "0.21.0", default-features = false }
 
diff --git a/crates/rustc-dependencies/src/lib.rs b/crates/rustc-dependencies/src/lib.rs
index d3f386fe08..d2aafe8a02 100644
--- a/crates/rustc-dependencies/src/lib.rs
+++ b/crates/rustc-dependencies/src/lib.rs
@@ -3,17 +3,6 @@
 
 #![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
 
-#[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::*;
-}
-
 #[cfg(feature = "in-rust-tree")]
 extern crate rustc_abi;
 

From f972da70d4b6ce79e43e07f68002227fd4db86f2 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Mon, 8 Jan 2024 15:39:35 +0100
Subject: [PATCH 3/3] Remove rustc_dependencies crate

---
 Cargo.lock                           | 14 +++-----------
 Cargo.toml                           |  3 ++-
 crates/hir-def/Cargo.toml            |  4 ++--
 crates/hir-def/src/data/adt.rs       |  2 +-
 crates/hir-def/src/lib.rs            |  8 +++++++-
 crates/hir-ty/Cargo.toml             |  6 ++++--
 crates/hir-ty/src/layout.rs          | 11 +++++------
 crates/hir-ty/src/layout/adt.rs      |  2 +-
 crates/hir-ty/src/lib.rs             | 15 +++++++++++----
 crates/rust-analyzer/Cargo.toml      |  4 +---
 crates/rustc-dependencies/Cargo.toml | 21 ---------------------
 crates/rustc-dependencies/src/lib.rs | 26 --------------------------
 12 files changed, 37 insertions(+), 79 deletions(-)
 delete mode 100644 crates/rustc-dependencies/Cargo.toml
 delete mode 100644 crates/rustc-dependencies/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 547940c91d..b1a1c8fb9f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -513,8 +513,8 @@ dependencies = [
  "mbe",
  "once_cell",
  "profile",
+ "ra-ap-rustc_abi",
  "ra-ap-rustc_parse_format",
- "rustc-dependencies",
  "rustc-hash",
  "smallvec",
  "span",
@@ -580,7 +580,8 @@ dependencies = [
  "oorandom",
  "profile",
  "project-model",
- "rustc-dependencies",
+ "ra-ap-rustc_abi",
+ "ra-ap-rustc_index",
  "rustc-hash",
  "scoped-tls",
  "smallvec",
@@ -1541,7 +1542,6 @@ dependencies = [
  "profile",
  "project-model",
  "rayon",
- "rustc-dependencies",
  "rustc-hash",
  "scip",
  "serde",
@@ -1600,14 +1600,6 @@ version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
-[[package]]
-name = "rustc-dependencies"
-version = "0.0.0"
-dependencies = [
- "ra-ap-rustc_abi",
- "ra-ap-rustc_index",
-]
-
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 1734c55a3f..a81c465963 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -78,10 +78,11 @@ toolchain = { path = "./crates/toolchain", version = "0.0.0" }
 tt = { path = "./crates/tt", version = "0.0.0" }
 vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
 vfs = { path = "./crates/vfs", version = "0.0.0" }
-rustc-dependencies = { path = "./crates/rustc-dependencies", version = "0.0.0" }
 
 ra-ap-rustc_lexer = { version = "0.21.0", default-features = false }
 ra-ap-rustc_parse_format = { version = "0.21.0", default-features = false }
+ra-ap-rustc_index = { version = "0.21.0", default-features = false }
+ra-ap-rustc_abi = { version = "0.21.0", default-features = false }
 
 # local crates that aren't published to crates.io. These should not have versions.
 sourcegen = { path = "./crates/sourcegen" }
diff --git a/crates/hir-def/Cargo.toml b/crates/hir-def/Cargo.toml
index fea7d81c6a..523ff6fc40 100644
--- a/crates/hir-def/Cargo.toml
+++ b/crates/hir-def/Cargo.toml
@@ -30,7 +30,7 @@ hashbrown.workspace = true
 triomphe.workspace = true
 
 ra-ap-rustc_parse_format.workspace = true
-rustc-dependencies.workspace = true
+ra-ap-rustc_abi.workspace = true
 
 # local deps
 stdx.workspace = true
@@ -54,7 +54,7 @@ test-utils.workspace = true
 test-fixture.workspace = true
 
 [features]
-in-rust-tree = ["rustc-dependencies/in-rust-tree"]
+in-rust-tree = []
 
 [lints]
 workspace = true
diff --git a/crates/hir-def/src/data/adt.rs b/crates/hir-def/src/data/adt.rs
index a95b78614e..8772c34f02 100644
--- a/crates/hir-def/src/data/adt.rs
+++ b/crates/hir-def/src/data/adt.rs
@@ -11,7 +11,7 @@ use hir_expand::{
 };
 use intern::Interned;
 use la_arena::{Arena, ArenaMap};
-use rustc_dependencies::abi::{Align, Integer, IntegerType, ReprFlags, ReprOptions};
+use rustc_abi::{Align, Integer, IntegerType, ReprFlags, ReprOptions};
 use syntax::ast::{self, HasName, HasVisibility};
 use triomphe::Arc;
 
diff --git a/crates/hir-def/src/lib.rs b/crates/hir-def/src/lib.rs
index 9d042ea935..aa84ccaee6 100644
--- a/crates/hir-def/src/lib.rs
+++ b/crates/hir-def/src/lib.rs
@@ -16,6 +16,12 @@ extern crate rustc_parse_format;
 #[cfg(not(feature = "in-rust-tree"))]
 extern crate ra_ap_rustc_parse_format as rustc_parse_format;
 
+#[cfg(feature = "in-rust-tree")]
+extern crate rustc_abi;
+
+#[cfg(not(feature = "in-rust-tree"))]
+extern crate ra_ap_rustc_abi as rustc_abi;
+
 pub mod db;
 
 pub mod attr;
@@ -50,7 +56,7 @@ pub mod visibility;
 pub mod find_path;
 pub mod import_map;
 
-pub use rustc_dependencies::abi as layout;
+pub use rustc_abi as layout;
 use triomphe::Arc;
 
 #[cfg(test)]
diff --git a/crates/hir-ty/Cargo.toml b/crates/hir-ty/Cargo.toml
index c7807bcf9a..803c18677d 100644
--- a/crates/hir-ty/Cargo.toml
+++ b/crates/hir-ty/Cargo.toml
@@ -34,7 +34,9 @@ nohash-hasher.workspace = true
 typed-arena = "2.0.1"
 indexmap.workspace = true
 
-rustc-dependencies.workspace = true
+ra-ap-rustc_abi.workspace = true
+ra-ap-rustc_index.workspace = true
+
 
 # local deps
 stdx.workspace = true
@@ -58,7 +60,7 @@ test-utils.workspace = true
 test-fixture.workspace = true
 
 [features]
-in-rust-tree = ["rustc-dependencies/in-rust-tree"]
+in-rust-tree = []
 
 [lints]
 workspace = true
diff --git a/crates/hir-ty/src/layout.rs b/crates/hir-ty/src/layout.rs
index 68619bb8b1..b7bfaf2931 100644
--- a/crates/hir-ty/src/layout.rs
+++ b/crates/hir-ty/src/layout.rs
@@ -12,10 +12,9 @@ use hir_def::{
     LocalEnumVariantId, LocalFieldId, StructId,
 };
 use la_arena::{Idx, RawIdx};
-use rustc_dependencies::{
-    abi::AddressSpace,
-    index::{IndexSlice, IndexVec},
-};
+use rustc_abi::AddressSpace;
+use rustc_index::{IndexSlice, IndexVec};
+
 use stdx::never;
 use triomphe::Arc;
 
@@ -35,7 +34,7 @@ mod target;
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct RustcEnumVariantIdx(pub LocalEnumVariantId);
 
-impl rustc_dependencies::index::Idx for RustcEnumVariantIdx {
+impl rustc_index::Idx for RustcEnumVariantIdx {
     fn new(idx: usize) -> Self {
         RustcEnumVariantIdx(Idx::from_raw(RawIdx::from(idx as u32)))
     }
@@ -54,7 +53,7 @@ impl RustcFieldIdx {
     }
 }
 
-impl rustc_dependencies::index::Idx for RustcFieldIdx {
+impl rustc_index::Idx for RustcFieldIdx {
     fn new(idx: usize) -> Self {
         RustcFieldIdx(Idx::from_raw(RawIdx::from(idx as u32)))
     }
diff --git a/crates/hir-ty/src/layout/adt.rs b/crates/hir-ty/src/layout/adt.rs
index 39788a9502..8a7715ce87 100644
--- a/crates/hir-ty/src/layout/adt.rs
+++ b/crates/hir-ty/src/layout/adt.rs
@@ -9,7 +9,7 @@ use hir_def::{
     AdtId, EnumVariantId, LocalEnumVariantId, VariantId,
 };
 use la_arena::RawIdx;
-use rustc_dependencies::index::IndexVec;
+use rustc_index::IndexVec;
 use smallvec::SmallVec;
 use triomphe::Arc;
 
diff --git a/crates/hir-ty/src/lib.rs b/crates/hir-ty/src/lib.rs
index 793b52b49f..e72864a12e 100644
--- a/crates/hir-ty/src/lib.rs
+++ b/crates/hir-ty/src/lib.rs
@@ -3,10 +3,17 @@
 #![warn(rust_2018_idioms, unused_lifetimes)]
 #![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
 
-#[allow(unused)]
-macro_rules! eprintln {
-    ($($tt:tt)*) => { stdx::eprintln!($($tt)*) };
-}
+#[cfg(feature = "in-rust-tree")]
+extern crate rustc_index;
+
+#[cfg(not(feature = "in-rust-tree"))]
+extern crate ra_ap_rustc_index as rustc_index;
+
+#[cfg(feature = "in-rust-tree")]
+extern crate rustc_abi;
+
+#[cfg(not(feature = "in-rust-tree"))]
+extern crate ra_ap_rustc_abi as rustc_abi;
 
 mod builder;
 mod chalk_db;
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index ad24d6d28c..7641416071 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -49,7 +49,6 @@ flycheck.workspace = true
 hir-def.workspace = true
 hir-ty.workspace = true
 hir.workspace = true
-rustc-dependencies.workspace = true
 ide-db.workspace = true
 # This should only be used in CLI
 ide-ssr.workspace = true
@@ -89,11 +88,10 @@ in-rust-tree = [
     "ide/in-rust-tree",
     "syntax/in-rust-tree",
     "parser/in-rust-tree",
-    "rustc-dependencies/in-rust-tree",
     "hir/in-rust-tree",
     "hir-def/in-rust-tree",
     "hir-ty/in-rust-tree",
 ]
 
 [lints]
-workspace = true
\ No newline at end of file
+workspace = true
diff --git a/crates/rustc-dependencies/Cargo.toml b/crates/rustc-dependencies/Cargo.toml
deleted file mode 100644
index a14cc60860..0000000000
--- a/crates/rustc-dependencies/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "rustc-dependencies"
-version = "0.0.0"
-description = "TBD"
-
-rust-version.workspace = true
-edition.workspace = true
-license.workspace = true
-authors.workspace = true
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-ra-ap-rustc_index = { version = "0.21.0", default-features = false }
-ra-ap-rustc_abi = { version = "0.21.0", default-features = false }
-
-[features]
-in-rust-tree = []
-
-[lints]
-workspace = true
diff --git a/crates/rustc-dependencies/src/lib.rs b/crates/rustc-dependencies/src/lib.rs
deleted file mode 100644
index d2aafe8a02..0000000000
--- a/crates/rustc-dependencies/src/lib.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-//! 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_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::*;
-}
-
-#[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::*;
-}