Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 13:48:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use SmolStr

Browse source
This commit is contained in:
Jonas Schievink 2020-07-02 15:42:37 +02:00
parent 361b399b6d
commit 6ee73cd334
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,7 @@ use std::{cmp::Ordering, fmt, hash::BuildHasherDefault, sync::Arc};
use fst::{self, Streamer}; use fst::{self, Streamer};
use indexmap::{map::Entry, IndexMap}; use indexmap::{map::Entry, IndexMap};
use ra_db::CrateId; use ra_db::CrateId;
use ra_syntax::SmolStr;
use rustc_hash::{FxHashMap, FxHasher}; use rustc_hash::{FxHashMap, FxHasher};
use smallvec::SmallVec; use smallvec::SmallVec;
@ -50,7 +51,7 @@ pub struct ImportMap {
/// Maps names of associated items to the item's ID. Only includes items whose defining trait is /// Maps names of associated items to the item's ID. Only includes items whose defining trait is
/// exported. /// exported.
assoc_map: FxHashMap<String, SmallVec<[AssocItemId; 1]>>, assoc_map: FxHashMap<SmolStr, SmallVec<[AssocItemId; 1]>>,
} }
impl ImportMap { impl ImportMap {
@ -162,7 +163,7 @@ impl ImportMap {
fn collect_trait_methods(&mut self, db: &dyn DefDatabase, tr: TraitId) { fn collect_trait_methods(&mut self, db: &dyn DefDatabase, tr: TraitId) {
let data = db.trait_data(tr); let data = db.trait_data(tr);
for (name, item) in data.items.iter() { for (name, item) in data.items.iter() {
self.assoc_map.entry(name.to_string()).or_default().push(*item); self.assoc_map.entry(name.to_string().into()).or_default().push(*item);
} }
} }
} }
@ -310,7 +311,7 @@ pub fn search_dependencies<'a>(
// Add all exported associated items whose names match the query (exactly). // Add all exported associated items whose names match the query (exactly).
for map in &import_maps { for map in &import_maps {
if let Some(v) = map.assoc_map.get(&query.query) { if let Some(v) = map.assoc_map.get(&*query.query) {
res.extend(v.iter().map(|&assoc| { res.extend(v.iter().map(|&assoc| {
ItemInNs::Types(match assoc { ItemInNs::Types(match assoc {
AssocItemId::FunctionId(it) => it.into(), AssocItemId::FunctionId(it) => it.into(),