diff options
Diffstat (limited to 'crates/hir_ty/src/utils.rs')
-rw-r--r-- | crates/hir_ty/src/utils.rs | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/crates/hir_ty/src/utils.rs b/crates/hir_ty/src/utils.rs index 8d5d5cd73..5f6cb052a 100644 --- a/crates/hir_ty/src/utils.rs +++ b/crates/hir_ty/src/utils.rs | |||
@@ -1,8 +1,7 @@ | |||
1 | //! Helper functions for working with def, which don't need to be a separate | 1 | //! Helper functions for working with def, which don't need to be a separate |
2 | //! query, but can't be computed directly from `*Data` (ie, which need a `db`). | 2 | //! query, but can't be computed directly from `*Data` (ie, which need a `db`). |
3 | use std::sync::Arc; | ||
4 | 3 | ||
5 | use chalk_ir::{BoundVar, DebruijnIndex}; | 4 | use chalk_ir::{fold::Shift, BoundVar, DebruijnIndex}; |
6 | use hir_def::{ | 5 | use hir_def::{ |
7 | db::DefDatabase, | 6 | db::DefDatabase, |
8 | generics::{ | 7 | generics::{ |
@@ -16,9 +15,7 @@ use hir_def::{ | |||
16 | }; | 15 | }; |
17 | use hir_expand::name::{name, Name}; | 16 | use hir_expand::name::{name, Name}; |
18 | 17 | ||
19 | use crate::{ | 18 | use crate::{db::HirDatabase, Interner, Substitution, TraitRef, TraitRefExt, TyKind, WhereClause}; |
20 | db::HirDatabase, Interner, Substitution, TraitRef, TraitRefExt, TyKind, TypeWalk, WhereClause, | ||
21 | }; | ||
22 | 19 | ||
23 | fn direct_super_traits(db: &dyn DefDatabase, trait_: TraitId) -> Vec<TraitId> { | 20 | fn direct_super_traits(db: &dyn DefDatabase, trait_: TraitId) -> Vec<TraitId> { |
24 | let resolver = trait_.resolver(db); | 21 | let resolver = trait_.resolver(db); |
@@ -69,7 +66,7 @@ fn direct_super_trait_refs(db: &dyn HirDatabase, trait_ref: &TraitRef) -> Vec<Tr | |||
69 | // FIXME: how to correctly handle higher-ranked bounds here? | 66 | // FIXME: how to correctly handle higher-ranked bounds here? |
70 | WhereClause::Implemented(tr) => Some( | 67 | WhereClause::Implemented(tr) => Some( |
71 | tr.clone() | 68 | tr.clone() |
72 | .shifted_out_to(DebruijnIndex::ONE) | 69 | .shifted_out_to(&Interner, DebruijnIndex::ONE) |
73 | .expect("FIXME unexpected higher-ranked trait bound"), | 70 | .expect("FIXME unexpected higher-ranked trait bound"), |
74 | ), | 71 | ), |
75 | _ => None, | 72 | _ => None, |
@@ -137,15 +134,6 @@ pub(super) fn associated_type_by_name_including_super_traits( | |||
137 | }) | 134 | }) |
138 | } | 135 | } |
139 | 136 | ||
140 | /// Helper for mutating `Arc<[T]>` (i.e. `Arc::make_mut` for Arc slices). | ||
141 | /// The underlying values are cloned if there are other strong references. | ||
142 | pub(crate) fn make_mut_slice<T: Clone>(a: &mut Arc<[T]>) -> &mut [T] { | ||
143 | if Arc::get_mut(a).is_none() { | ||
144 | *a = a.iter().cloned().collect(); | ||
145 | } | ||
146 | Arc::get_mut(a).unwrap() | ||
147 | } | ||
148 | |||
149 | pub(crate) fn generics(db: &dyn DefDatabase, def: GenericDefId) -> Generics { | 137 | pub(crate) fn generics(db: &dyn DefDatabase, def: GenericDefId) -> Generics { |
150 | let parent_generics = parent_generic_def(db, def).map(|def| Box::new(generics(db, def))); | 138 | let parent_generics = parent_generic_def(db, def).map(|def| Box::new(generics(db, def))); |
151 | Generics { def, params: db.generic_params(def), parent_generics } | 139 | Generics { def, params: db.generic_params(def), parent_generics } |