language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use traits from where clauses for method resolution

Browse source 
E.g. if we have `T: some::Trait`, we can call methods from that trait without it
needing to be in scope.
This commit is contained in:
Florian Diebold 2019-09-07 16:24:26 +02:00
parent d21cdf3c99
commit a1776b27c7
4 changed files with 44 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/ra_hir/src/code_model.rs
View file

@ -847,16 +847,22 @@ impl Trait {
.collect()
}
/// Returns an iterator over the whole super trait hierarchy (not including
/// the trait itself). (This iterator may be infinite in case of circular
/// super trait dependencies, which are possible in malformed code.)
/// Returns an iterator over the whole super trait hierarchy (including the
/// trait itself).
pub fn all_super_traits<'a>(
self,
db: &'a impl HirDatabase,
) -> impl Iterator<Item = Trait> + 'a {
self.direct_super_traits(db).into_iter().flat_map(move |t| {
self.all_super_traits_inner(db).unique()
}
fn all_super_traits_inner<'a>(
self,
db: &'a impl HirDatabase,
) -> impl Iterator<Item = Trait> + 'a {
iter::once(self).chain(self.direct_super_traits(db).into_iter().flat_map(move |t| {
iter::once(t).chain(Box::new(t.all_super_traits(db)) as Box<dyn Iterator<Item = Trait>>)
})
}))
}
pub fn associated_type_by_name(self, db: &impl DefDatabase, name: &Name) -> Option<TypeAlias> {
@ -876,10 +882,7 @@ impl Trait {
db: &impl HirDatabase,
name: &Name,
) -> Option<TypeAlias> {
iter::once(self)
.chain(self.all_super_traits(db))
.unique()
.find_map(|t| t.associated_type_by_name(db, name))
self.all_super_traits(db).find_map(|t| t.associated_type_by_name(db, name))
}
pub(crate) fn trait_data(self, db: &impl DefDatabase) -> Arc<TraitData> {