From f7f7c2aff80f0870f0d71bf70075e3b5bf68994f Mon Sep 17 00:00:00 2001
From: uHOOCCOOHu <hooccooh1896@gmail.com>
Date: Sun, 8 Sep 2019 00:05:58 +0800
Subject: Revert "Replace with immutable map to avoid heavy cloning"

This reverts commit 2c494eb803c88ef5d23607c3b156fce60c2b8076.

See: https://github.com/rust-analyzer/rust-analyzer/pull/1784#issuecomment-529119924
---
 crates/ra_hir/src/nameres.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'crates/ra_hir/src/nameres.rs')

diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs
index 7e5138d05..befbb2a9b 100644
--- a/crates/ra_hir/src/nameres.rs
+++ b/crates/ra_hir/src/nameres.rs
@@ -54,7 +54,6 @@ mod mod_resolution;
 #[cfg(test)]
 mod tests;
 
-use std::hash::BuildHasherDefault;
 use std::sync::Arc;
 
 use once_cell::sync::Lazy;
@@ -62,7 +61,7 @@ use ra_arena::{impl_arena_id, Arena, RawId};
 use ra_db::{Edition, FileId};
 use ra_prof::profile;
 use ra_syntax::ast;
-use rustc_hash::{FxHashMap, FxHashSet, FxHasher};
+use rustc_hash::{FxHashMap, FxHashSet};
 use test_utils::tested_by;
 
 use crate::{
@@ -74,8 +73,6 @@ use crate::{
     AstId, BuiltinType, Crate, HirFileId, MacroDef, Module, ModuleDef, Name, Path, PathKind, Trait,
 };
 
-pub(crate) type ImmFxHashMap<K, V> = im::HashMap<K, V, BuildHasherDefault<FxHasher>>;
-
 pub(crate) use self::raw::{ImportSourceMap, RawItems};
 
 pub use self::{
@@ -142,7 +139,7 @@ pub(crate) struct ModuleData {
 pub struct ModuleScope {
     items: FxHashMap<Name, Resolution>,
     macros: FxHashMap<Name, MacroDef>,
-    textual_macros: ImmFxHashMap<Name, MacroDef>,
+    textual_macros: FxHashMap<Name, MacroDef>,
 }
 
 static BUILTIN_SCOPE: Lazy<FxHashMap<Name, Resolution>> = Lazy::new(|| {
-- 
cgit v1.2.3