Switch next-solver related rustc dependencies of r-a to crates.io ones

Author: ShoyuVanilla

src/tools/rust-analyzer/crates/hir-ty/src/lib.rs

@@ -9,6 +9,8 @@ extern crate rustc_index;
 #[cfg(not(feature = "in-rust-tree"))]
 extern crate ra_ap_rustc_index as rustc_index;
 
+extern crate ra_ap_rustc_index as rustc_index_nextsolver;
+
 #[cfg(feature = "in-rust-tree")]
 extern crate rustc_abi;
 
@@ -21,27 +23,12 @@ extern crate rustc_pattern_analysis;
 #[cfg(not(feature = "in-rust-tree"))]
 extern crate ra_ap_rustc_pattern_analysis as rustc_pattern_analysis;
 
-#[cfg(feature = "in-rust-tree")]
-extern crate rustc_ast_ir;
-
-#[cfg(not(feature = "in-rust-tree"))]
 extern crate ra_ap_rustc_ast_ir as rustc_ast_ir;
 
-#[cfg(feature = "in-rust-tree")]
-extern crate rustc_type_ir;
-
-#[cfg(not(feature = "in-rust-tree"))]
 extern crate ra_ap_rustc_type_ir as rustc_type_ir;
 
-#[cfg(feature = "in-rust-tree")]
-extern crate rustc_next_trait_solver;
-
-#[cfg(not(feature = "in-rust-tree"))]
 extern crate ra_ap_rustc_next_trait_solver as rustc_next_trait_solver;
 
-#[cfg(feature = "in-rust-tree")]
-extern crate rustc_data_structures as ena;
-
 mod builder;
 mod chalk_db;
 mod chalk_ext;

src/tools/rust-analyzer/crates/hir-ty/src/next_solver/consts.rs

@@ -36,8 +36,6 @@ impl<'db> Const<'db> {
             internee: kind,
             flags: flags.flags,
             outer_exclusive_binder: flags.outer_exclusive_binder,
-            #[cfg(feature = "in-rust-tree")]
-            stable_hash: ena::fingerprint::Fingerprint::ZERO,
         };
         Const::new_(interner.db(), InternedWrapperNoDebug(cached))
     }

src/tools/rust-analyzer/crates/hir-ty/src/next_solver/infer/canonical/canonicalizer.rs

@@ -6,7 +6,7 @@
 //! [c]: https://rust-lang.github.io/chalk/book/canonical_queries/canonicalization.html
 
 use rustc_hash::FxHashMap;
-use rustc_index::Idx;
+use rustc_index_nextsolver::Idx;
 use rustc_type_ir::InferTy::{self, FloatVar, IntVar, TyVar};
 use rustc_type_ir::inherent::{Const as _, IntoKind as _, Region as _, SliceLike, Ty as _};
 use rustc_type_ir::{

src/tools/rust-analyzer/crates/hir-ty/src/next_solver/infer/canonical/mod.rs

@@ -31,7 +31,7 @@ use crate::next_solver::{
     },
 };
 use instantiate::CanonicalExt;
-use rustc_index::IndexVec;
+use rustc_index_nextsolver::IndexVec;
 use rustc_type_ir::inherent::IntoKind;
 use rustc_type_ir::{
     AliasRelationDirection, AliasTyKind, CanonicalVarKind, InferTy, TypeFoldable, UniverseIndex,

src/tools/rust-analyzer/crates/hir-ty/src/next_solver/infer/region_constraints/mod.rs

@@ -7,7 +7,7 @@ use std::{cmp, fmt, mem};
 use ena::undo_log::{Rollback, UndoLogs};
 use ena::unify as ut;
 use rustc_hash::FxHashMap;
-use rustc_index::IndexVec;
+use rustc_index_nextsolver::IndexVec;
 use rustc_type_ir::inherent::IntoKind;
 use rustc_type_ir::{RegionKind, RegionVid, UniverseIndex};
 use tracing::{debug, instrument};

src/tools/rust-analyzer/crates/hir-ty/src/next_solver/infer/type_variable.rs

@@ -7,7 +7,7 @@ use std::ops::Range;
 use ena::snapshot_vec as sv;
 use ena::undo_log::Rollback;
 use ena::unify as ut;
-use rustc_index::IndexVec;
+use rustc_index_nextsolver::IndexVec;
 use rustc_type_ir::TyVid;
 use rustc_type_ir::UniverseIndex;
 use rustc_type_ir::inherent::Ty as _;

src/tools/rust-analyzer/crates/hir-ty/src/next_solver/interner.rs

@@ -13,7 +13,7 @@ use intern::{Interned, impl_internable, sym};
 use la_arena::Idx;
 use rustc_abi::{Align, ReprFlags, ReprOptions};
 use rustc_hash::FxHashSet;
-use rustc_index::bit_set::DenseBitSet;
+use rustc_index_nextsolver::bit_set::DenseBitSet;
 use rustc_type_ir::elaborate::elaborate;
 use rustc_type_ir::error::TypeError;
 use rustc_type_ir::inherent::{
@@ -33,7 +33,7 @@ use syntax::ast::SelfParamKind;
 use triomphe::Arc;
 
 use rustc_ast_ir::visit::VisitorResult;
-use rustc_index::IndexVec;
+use rustc_index_nextsolver::IndexVec;
 use rustc_type_ir::TypeVisitableExt;
 use rustc_type_ir::{
     BoundVar, CollectAndApply, DebruijnIndex, GenericArgKind, RegionKind, TermKind, UniverseIndex,

src/tools/rust-analyzer/crates/hir-ty/src/next_solver/predicate.rs

@@ -227,8 +227,6 @@ impl<'db> Predicate<'db> {
             internee: kind,
             flags: flags.flags,
             outer_exclusive_binder: flags.outer_exclusive_binder,
-            #[cfg(feature = "in-rust-tree")]
-            stable_hash: ena::fingerprint::Fingerprint::ZERO,
         };
         Predicate::new_(interner.db(), InternedWrapperNoDebug(cached))
     }

src/tools/rust-analyzer/crates/hir-ty/src/next_solver/ty.rs

@@ -60,8 +60,6 @@ impl<'db> Ty<'db> {
             internee: kind,
             flags: flags.flags,
             outer_exclusive_binder: flags.outer_exclusive_binder,
-            #[cfg(feature = "in-rust-tree")]
-            stable_hash: ena::fingerprint::Fingerprint::ZERO,
         };
         Ty::new_(interner.db(), InternedWrapperNoDebug(cached))
     }

src/tools/rust-analyzer/crates/hir/src/lib.rs

@@ -20,10 +20,6 @@
 #![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
 #![recursion_limit = "512"]
 
-#[cfg(feature = "in-rust-tree")]
-extern crate rustc_type_ir;
-
-#[cfg(not(feature = "in-rust-tree"))]
 extern crate ra_ap_rustc_type_ir as rustc_type_ir;
 
 mod attrs;