language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-26 20:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use traits from prelude for method resolution

Browse source
This commit is contained in:
Florian Diebold 2019-05-12 14:58:37 +02:00
parent 7fda874dd4
commit bc59f83991
3 changed files with 42 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/ra_hir/src/resolve.rs
View file

@ -3,7 +3,7 @@ use std::sync::Arc;
use ra_syntax::ast;
use rustc_hash::FxHashMap;
use rustc_hash::{FxHashMap, FxHashSet};
use crate::{
ModuleDef, Trait,
@ -193,19 +193,18 @@ impl Resolver {
names
}
pub(crate) fn traits_in_scope<'a>(&'a self) -> impl Iterator<Item = Trait> + 'a {
// FIXME prelude
self.scopes
.iter()
.rev()
.flat_map(|scope| {
match scope {
Scope::ModuleScope(m) => Some(m.crate_def_map[m.module_id].scope.traits()),
_ => None,
pub(crate) fn traits_in_scope(&self, db: &impl HirDatabase) -> FxHashSet<Trait> {
let mut traits = FxHashSet::default();
for scope in &self.scopes {
if let Scope::ModuleScope(m) = scope {
if let Some(prelude) = m.crate_def_map.prelude() {
let prelude_def_map = db.crate_def_map(prelude.krate);
traits.extend(prelude_def_map[prelude.module_id].scope.traits());
}
.into_iter()
})
.flatten()
traits.extend(m.crate_def_map[m.module_id].scope.traits());
}
}
traits
}
fn module(&self) -> Option<(&CrateDefMap, CrateModuleId)> {