Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 12:33:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

ImportMap: use IndexMap internally

Browse source 
It iterates in insertion order, which makes the ordering more
predictable.
This commit is contained in:
Jonas Schievink 2020-06-10 16:15:49 +02:00
parent 7e83ed99a8
commit dd22657407
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -982,6 +982,7 @@ dependencies = [
"drop_bomb",
"either",
"fst",
"indexmap",
"insta",
"itertools",
"log",

1
crates/ra_hir_def/Cargo.toml
View file

@ -16,6 +16,7 @@ anymap = "0.12.1"
drop_bomb = "0.1.4"
fst = { version = "0.4", default-features = false }
itertools = "0.9.0"
indexmap = "1.4.0"
stdx = { path = "../stdx" }

21
crates/ra_hir_def/src/import_map.rs
View file

@ -1,10 +1,11 @@
//! A map of all publicly exported items in a crate.
use std::{cmp::Ordering, collections::hash_map::Entry, fmt, sync::Arc};
use std::{cmp::Ordering, fmt, hash::BuildHasherDefault, sync::Arc};
use fst::{self, Streamer};
use indexmap::{map::Entry, IndexMap};
use ra_db::CrateId;
use rustc_hash::FxHashMap;
use rustc_hash::FxHasher;
use crate::{
db::DefDatabase,
@ -14,6 +15,8 @@ use crate::{
ModuleDefId, ModuleId,
};
type FxIndexMap<K, V> = IndexMap<K, V, BuildHasherDefault<FxHasher>>;
/// A map from publicly exported items to the path needed to import/name them from a downstream
/// crate.
///
@ -23,7 +26,7 @@ use crate::{
/// Note that all paths are relative to the containing crate's root, so the crate name still needs
/// to be prepended to the `ModPath` before the path is valid.
pub struct ImportMap {
map: FxHashMap<ItemInNs, ModPath>,
map: FxIndexMap<ItemInNs, ModPath>,
/// List of keys stored in `map`, sorted lexicographically by their `ModPath`. Indexed by the
/// values returned by running `fst`.
@ -39,7 +42,7 @@ impl ImportMap {
pub fn import_map_query(db: &dyn DefDatabase, krate: CrateId) -> Arc<Self> {
let _p = ra_prof::profile("import_map_query");
let def_map = db.crate_def_map(krate);
let mut import_map = FxHashMap::with_capacity_and_hasher(64, Default::default());
let mut import_map = FxIndexMap::with_capacity_and_hasher(64, Default::default());
// We look only into modules that are public(ly reexported), starting with the crate root.
let empty = ModPath { kind: PathKind::Plain, segments: vec![] };
@ -588,9 +591,9 @@ mod tests {
let res = search_dependencies_of(ra_fixture, "main", Query::new("fmt"));
assert_snapshot!(res, @r###"
dep::Fmt (v)
dep::fmt (t)
dep::Fmt (t)
dep::Fmt (v)
dep::Fmt (m)
dep::fmt::Display (t)
dep::format (v)
@ -598,9 +601,9 @@ mod tests {
let res = search_dependencies_of(ra_fixture, "main", Query::new("fmt").anchor_end());
assert_snapshot!(res, @r###"
dep::Fmt (v)
dep::fmt (t)
dep::Fmt (t)
dep::Fmt (v)
dep::Fmt (m)
"###);
}
@ -618,17 +621,17 @@ mod tests {
let res = search_dependencies_of(ra_fixture, "main", Query::new("FMT"));
assert_snapshot!(res, @r###"
dep::FMT (v)
dep::FMT (t)
dep::fmt (t)
dep::fmt (v)
dep::FMT (t)
dep::FMT (v)
"###);
let res = search_dependencies_of(ra_fixture, "main", Query::new("FMT").case_sensitive());
assert_snapshot!(res, @r###"
dep::FMT (v)
dep::FMT (t)
dep::FMT (v)
"###);
}