diff options
| author | David Barsky <me@davidbarsky.com> | 2025-09-16 18:36:41 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-16 18:36:41 +0000 |
| commit | dfa11e7d613c6e513f9865099227cda94f6f869f (patch) | |
| tree | c56f3f662189c745025987b5eba078a2bd2296b9 | |
| parent | 1b3c3a8f9130fb2959b696d9ee8223b803bf9032 (diff) | |
| parent | f71f75669563cc9fb74c629937046c1f13d3698e (diff) | |
| download | rust-dfa11e7d613c6e513f9865099227cda94f6f869f.tar.gz rust-dfa11e7d613c6e513f9865099227cda94f6f869f.zip | |
Merge pull request #20677 from ShoyuVanilla/fix-ena
Fix "sync-from-ra" for `rust-lang/rust`
| -rw-r--r-- | src/tools/rust-analyzer/crates/hir-ty/src/lib.rs | 3 | ||||
| -rw-r--r-- | src/tools/rust-analyzer/crates/hir-ty/src/next_solver.rs | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/lib.rs b/src/tools/rust-analyzer/crates/hir-ty/src/lib.rs index 02fdbf0ebf0..37d5347fe7e 100644 --- a/src/tools/rust-analyzer/crates/hir-ty/src/lib.rs +++ b/src/tools/rust-analyzer/crates/hir-ty/src/lib.rs @@ -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; diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/next_solver.rs b/src/tools/rust-analyzer/crates/hir-ty/src/next_solver.rs index 0225deebe4f..99a501b0534 100644 --- a/src/tools/rust-analyzer/crates/hir-ty/src/next_solver.rs +++ b/src/tools/rust-analyzer/crates/hir-ty/src/next_solver.rs @@ -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>>; |