mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up comments / use nicer Iterator methods

Browse source
This commit is contained in:
Florian Diebold 2019-03-25 21:24:20 +01:00
parent 0f7e4a7d24
commit 99711c1863
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -187,7 +187,7 @@ impl Resolver {
} }
.into_iter() .into_iter()
}) })
.flat_map(|i| i) .flatten()
} }
fn module(&self) -> Option<(&CrateDefMap, CrateModuleId)> { fn module(&self) -> Option<(&CrateDefMap, CrateModuleId)> {

23
crates/ra_hir/src/ty/method_resolution.rs
View file

@ -118,12 +118,8 @@ pub(crate) fn implements(db: &impl HirDatabase, trait_ref: TraitRef) -> bool {
None => return false, None => return false,
}; };
let crate_impl_blocks = db.impls_in_crate(krate); let crate_impl_blocks = db.impls_in_crate(krate);
for impl_block in crate_impl_blocks.lookup_impl_blocks_for_trait(&trait_ref.trait_) { let mut impl_blocks = crate_impl_blocks.lookup_impl_blocks_for_trait(&trait_ref.trait_);
if &impl_block.target_ty(db) == trait_ref.self_ty() { impl_blocks.any(|impl_block| &impl_block.target_ty(db) == trait_ref.self_ty())
return true;
}
}
false
} }
fn def_crate(db: &impl HirDatabase, ty: &Ty) -> Option<Crate> { fn def_crate(db: &impl HirDatabase, ty: &Ty) -> Option<Crate> {
@ -145,7 +141,7 @@ impl Ty {
name: &Name, name: &Name,
resolver: &Resolver, resolver: &Resolver,
) -> Option<(Ty, Function)> { ) -> Option<(Ty, Function)> {
// FIXME: what has priority, an inherent method that needs autoderefs or a trait method? // FIXME: trait methods should be used before autoderefs
let inherent_method = self.clone().iterate_methods(db, |ty, f| { let inherent_method = self.clone().iterate_methods(db, |ty, f| {
let sig = f.signature(db); let sig = f.signature(db);
if sig.name() == name && sig.has_self_param() { if sig.name() == name && sig.has_self_param() {
@ -178,12 +174,21 @@ impl Ty {
} }
} }
} }
// FIXME the implements check may result in other obligations or unifying variables? // FIXME:
// - we might not actually be able to determine fully that the type
// implements the trait here; it's enough if we (well, Chalk) determine
// that it's possible.
// - when the trait method is picked, we need to register an
// 'obligation' somewhere so that we later check that it's really
// implemented
// - both points go for additional requirements from where clauses as
// well (in fact, the 'implements' condition could just be considered a
// 'where Self: Trait' clause)
candidates.retain(|(t, _m)| { candidates.retain(|(t, _m)| {
let trait_ref = TraitRef { trait_: *t, substs: Substs::single(self.clone()) }; let trait_ref = TraitRef { trait_: *t, substs: Substs::single(self.clone()) };
db.implements(trait_ref) db.implements(trait_ref)
}); });
// FIXME what happens if there are still multiple potential candidates? // FIXME if there's multiple candidates here, that's an ambiguity error
let (_chosen_trait, chosen_method) = candidates.first()?; let (_chosen_trait, chosen_method) = candidates.first()?;
Some((self.clone(), *chosen_method)) Some((self.clone(), *chosen_method))
} }