diff options
Diffstat (limited to 'crates/ra_hir_ty/src/utils.rs')
-rw-r--r-- | crates/ra_hir_ty/src/utils.rs | 46 |
1 files changed, 8 insertions, 38 deletions
diff --git a/crates/ra_hir_ty/src/utils.rs b/crates/ra_hir_ty/src/utils.rs index f98350bf9..e3e244268 100644 --- a/crates/ra_hir_ty/src/utils.rs +++ b/crates/ra_hir_ty/src/utils.rs | |||
@@ -110,46 +110,15 @@ pub(super) fn all_super_trait_refs(db: &dyn HirDatabase, trait_ref: TraitRef) -> | |||
110 | result | 110 | result |
111 | } | 111 | } |
112 | 112 | ||
113 | /// Finds a path from a trait to one of its super traits. Returns an empty | ||
114 | /// vector if there is no path. | ||
115 | pub(super) fn find_super_trait_path( | ||
116 | db: &dyn DefDatabase, | ||
117 | trait_: TraitId, | ||
118 | super_trait: TraitId, | ||
119 | ) -> Vec<TraitId> { | ||
120 | let mut result = Vec::with_capacity(2); | ||
121 | result.push(trait_); | ||
122 | return if go(db, super_trait, &mut result) { result } else { Vec::new() }; | ||
123 | |||
124 | fn go(db: &dyn DefDatabase, super_trait: TraitId, path: &mut Vec<TraitId>) -> bool { | ||
125 | let trait_ = *path.last().unwrap(); | ||
126 | if trait_ == super_trait { | ||
127 | return true; | ||
128 | } | ||
129 | |||
130 | for tt in direct_super_traits(db, trait_) { | ||
131 | if path.contains(&tt) { | ||
132 | continue; | ||
133 | } | ||
134 | path.push(tt); | ||
135 | if go(db, super_trait, path) { | ||
136 | return true; | ||
137 | } else { | ||
138 | path.pop(); | ||
139 | } | ||
140 | } | ||
141 | false | ||
142 | } | ||
143 | } | ||
144 | |||
145 | pub(super) fn associated_type_by_name_including_super_traits( | 113 | pub(super) fn associated_type_by_name_including_super_traits( |
146 | db: &dyn DefDatabase, | 114 | db: &dyn HirDatabase, |
147 | trait_: TraitId, | 115 | trait_ref: TraitRef, |
148 | name: &Name, | 116 | name: &Name, |
149 | ) -> Option<TypeAliasId> { | 117 | ) -> Option<(TraitRef, TypeAliasId)> { |
150 | all_super_traits(db, trait_) | 118 | all_super_trait_refs(db, trait_ref).into_iter().find_map(|t| { |
151 | .into_iter() | 119 | let assoc_type = db.trait_data(t.trait_).associated_type_by_name(name)?; |
152 | .find_map(|t| db.trait_data(t).associated_type_by_name(name)) | 120 | Some((t, assoc_type)) |
121 | }) | ||
153 | } | 122 | } |
154 | 123 | ||
155 | pub(super) fn variant_data(db: &dyn DefDatabase, var: VariantId) -> Arc<VariantData> { | 124 | pub(super) fn variant_data(db: &dyn DefDatabase, var: VariantId) -> Arc<VariantData> { |
@@ -176,6 +145,7 @@ pub(crate) fn generics(db: &dyn DefDatabase, def: GenericDefId) -> Generics { | |||
176 | Generics { def, params: db.generic_params(def), parent_generics } | 145 | Generics { def, params: db.generic_params(def), parent_generics } |
177 | } | 146 | } |
178 | 147 | ||
148 | #[derive(Debug)] | ||
179 | pub(crate) struct Generics { | 149 | pub(crate) struct Generics { |
180 | def: GenericDefId, | 150 | def: GenericDefId, |
181 | pub(crate) params: Arc<GenericParams>, | 151 | pub(crate) params: Arc<GenericParams>, |