mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unneccesary reference for trait name

Browse Source
This commit is contained in:
Jesper Steen Møller 2019-05-02 13:40:12 +02:00
parent 7dbb5e3b49
commit fc34d5f608
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc_resolve/lib.rs
View File

@ -4643,14 +4643,14 @@ impl<'a> Resolver<'a> {
false,
module.span,
).is_ok() {
let import_ids = self.find_transitive_imports(&binding.kind, &trait_name);
let import_ids = self.find_transitive_imports(&binding.kind, trait_name);
let trait_def_id = module.def_id().unwrap();
found_traits.push(TraitCandidate { def_id: trait_def_id, import_ids });
}
} else if let Res::Def(DefKind::TraitAlias, _) = binding.res() {
// For now, just treat all trait aliases as possible candidates, since we don't
// know if the ident is somewhere in the transitive bounds.
let import_ids = self.find_transitive_imports(&binding.kind, &trait_name);
let import_ids = self.find_transitive_imports(&binding.kind, trait_name);
let trait_def_id = binding.res().def_id();
found_traits.push(TraitCandidate { def_id: trait_def_id, import_ids });
} else {
@ -4660,11 +4660,11 @@ impl<'a> Resolver<'a> {
}
fn find_transitive_imports(&mut self, mut kind: &NameBindingKind<'_>,
trait_name: &Ident) -> SmallVec<[NodeId; 1]> {
trait_name: Ident) -> SmallVec<[NodeId; 1]> {
let mut import_ids = smallvec![];
while let NameBindingKind::Import { directive, binding, .. } = kind {
self.maybe_unused_trait_imports.insert(directive.id);
self.add_to_glob_map(&directive, *trait_name);
self.add_to_glob_map(&directive, trait_name);
import_ids.push(directive.id);
kind = &binding.kind;
};