diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-04-25 13:25:28 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-04-25 13:25:28 +0100 |
commit | 05981823bac91ba338110902fd435c6e3166f1d6 (patch) | |
tree | 24b14acc3cfb37489c413c0dfba16dbc8b630869 /crates/ra_hir_ty/src/db.rs | |
parent | 7bc71732300a57fad928393220ecbe5f751cc20f (diff) | |
parent | 970dbf871795650ecf49b7198d53bdcad9c612af (diff) |
Merge #4135
4135: Rename StructField -> Field r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty/src/db.rs')
-rw-r--r-- | crates/ra_hir_ty/src/db.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir_ty/src/db.rs b/crates/ra_hir_ty/src/db.rs index 9e5dfeab3..fdb49560b 100644 --- a/crates/ra_hir_ty/src/db.rs +++ b/crates/ra_hir_ty/src/db.rs | |||
@@ -3,7 +3,7 @@ | |||
3 | use std::sync::Arc; | 3 | use std::sync::Arc; |
4 | 4 | ||
5 | use hir_def::{ | 5 | use hir_def::{ |
6 | db::DefDatabase, DefWithBodyId, GenericDefId, ImplId, LocalStructFieldId, TraitId, TypeParamId, | 6 | db::DefDatabase, DefWithBodyId, GenericDefId, ImplId, LocalFieldId, TraitId, TypeParamId, |
7 | VariantId, | 7 | VariantId, |
8 | }; | 8 | }; |
9 | use ra_arena::map::ArenaMap; | 9 | use ra_arena::map::ArenaMap; |
@@ -43,7 +43,7 @@ pub trait HirDatabase: DefDatabase + Upcast<dyn DefDatabase> { | |||
43 | fn impl_trait(&self, def: ImplId) -> Option<Binders<TraitRef>>; | 43 | fn impl_trait(&self, def: ImplId) -> Option<Binders<TraitRef>>; |
44 | 44 | ||
45 | #[salsa::invoke(crate::lower::field_types_query)] | 45 | #[salsa::invoke(crate::lower::field_types_query)] |
46 | fn field_types(&self, var: VariantId) -> Arc<ArenaMap<LocalStructFieldId, Binders<Ty>>>; | 46 | fn field_types(&self, var: VariantId) -> Arc<ArenaMap<LocalFieldId, Binders<Ty>>>; |
47 | 47 | ||
48 | #[salsa::invoke(crate::callable_item_sig)] | 48 | #[salsa::invoke(crate::callable_item_sig)] |
49 | fn callable_item_signature(&self, def: CallableDef) -> PolyFnSig; | 49 | fn callable_item_signature(&self, def: CallableDef) -> PolyFnSig; |