user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #20677 from ShoyuVanilla/fix-ena

Browse source 
Fix "sync-from-ra" for `rust-lang/rust`
This commit is contained in:
David Barsky 2025-09-16 18:36:41 +00:00 • committed by GitHub
commit dfa11e7d61
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,6 +39,9 @@ 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;

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

@ -40,5 +40,8 @@ pub type AliasTy<'db> = rustc_type_ir::AliasTy<DbInterner<'db>>;
pub type PolyFnSig<'db> = Binder<'db, rustc_type_ir::FnSig<DbInterner<'db>>>;
pub type TypingMode<'db> = rustc_type_ir::TypingMode<DbInterner<'db>>;
#[cfg(feature = "in-rust-tree")]
use rustc_data_structure::sorted_map::index_map as indexmap;
pub type FxIndexMap<K, V> =
indexmap::IndexMap<K, V, std::hash::BuildHasherDefault<rustc_hash::FxHasher>>;