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

Fix crash for super trait cycles

Browse source
This commit is contained in:
Florian Diebold 2019-09-07 16:39:05 +02:00
parent 9db34eec20
commit 8fb3cab76c
4 changed files with 39 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,8 @@
pub(crate) mod src;
pub(crate) mod docs;
use std::iter;
use std::sync::Arc;
use itertools::Itertools;
use ra_db::{CrateId, Edition, FileId, SourceRootId};
use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner};
@ -849,20 +846,23 @@ impl Trait {
/// 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.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 all_super_traits(self, db: &impl HirDatabase) -> Vec<Trait> {
// we need to take care a bit here to avoid infinite loops in case of cycles
// (i.e. if we have `trait A: B; trait B: A;`)
let mut result = vec![self];
let mut i = 0;
while i < result.len() {
let t = result[i];
// yeah this is quadratic, but trait hierarchies should be flat
// enough that this doesn't matter
for tt in t.direct_super_traits(db) {
if !result.contains(&tt) {
result.push(tt);
}
}
i += 1;
}
result
}
pub fn associated_type_by_name(self, db: &impl DefDatabase, name: &Name) -> Option<TypeAlias> {
@ -882,7 +882,7 @@ impl Trait {
db: &impl HirDatabase,
name: &Name,
) -> Option<TypeAlias> {
self.all_super_traits(db).find_map(|t| t.associated_type_by_name(db, name))
self.all_super_traits(db).into_iter().find_map(|t| t.associated_type_by_name(db, name))
}
pub(crate) fn trait_data(self, db: &impl DefDatabase) -> Arc<TraitData> {