diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-17 11:37:34 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-12-17 11:37:34 +0000 |
commit | ce8ec2863887618dc40c47c075a83d7704452b0b (patch) | |
tree | b8849bc4765766dc43e92a12f52ab287680528f5 /crates/hir/src/code_model.rs | |
parent | d641bccb0ffec543fa444ba523e8d4b63078fa53 (diff) | |
parent | 2ae31e34b1a345ceea23198a7e9e32e557cdbb4d (diff) |
Merge #6914
6914: Rename ImplDef -> Impl r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/hir/src/code_model.rs')
-rw-r--r-- | crates/hir/src/code_model.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/crates/hir/src/code_model.rs b/crates/hir/src/code_model.rs index b1a1bc337..84e8c8047 100644 --- a/crates/hir/src/code_model.rs +++ b/crates/hir/src/code_model.rs | |||
@@ -402,9 +402,9 @@ impl Module { | |||
402 | def_map[self.id.local_id].scope.declarations().map(ModuleDef::from).collect() | 402 | def_map[self.id.local_id].scope.declarations().map(ModuleDef::from).collect() |
403 | } | 403 | } |
404 | 404 | ||
405 | pub fn impl_defs(self, db: &dyn HirDatabase) -> Vec<ImplDef> { | 405 | pub fn impl_defs(self, db: &dyn HirDatabase) -> Vec<Impl> { |
406 | let def_map = db.crate_def_map(self.id.krate); | 406 | let def_map = db.crate_def_map(self.id.krate); |
407 | def_map[self.id.local_id].scope.impls().map(ImplDef::from).collect() | 407 | def_map[self.id.local_id].scope.impls().map(Impl::from).collect() |
408 | } | 408 | } |
409 | 409 | ||
410 | pub(crate) fn with_module_id(self, module_id: LocalModuleId) -> Module { | 410 | pub(crate) fn with_module_id(self, module_id: LocalModuleId) -> Module { |
@@ -1007,7 +1007,7 @@ pub enum AssocItem { | |||
1007 | } | 1007 | } |
1008 | pub enum AssocItemContainer { | 1008 | pub enum AssocItemContainer { |
1009 | Trait(Trait), | 1009 | Trait(Trait), |
1010 | ImplDef(ImplDef), | 1010 | Impl(Impl), |
1011 | } | 1011 | } |
1012 | pub trait AsAssocItem { | 1012 | pub trait AsAssocItem { |
1013 | fn as_assoc_item(self, db: &dyn HirDatabase) -> Option<AssocItem>; | 1013 | fn as_assoc_item(self, db: &dyn HirDatabase) -> Option<AssocItem>; |
@@ -1064,7 +1064,7 @@ impl AssocItem { | |||
1064 | }; | 1064 | }; |
1065 | match container { | 1065 | match container { |
1066 | AssocContainerId::TraitId(id) => AssocItemContainer::Trait(id.into()), | 1066 | AssocContainerId::TraitId(id) => AssocItemContainer::Trait(id.into()), |
1067 | AssocContainerId::ImplId(id) => AssocItemContainer::ImplDef(id.into()), | 1067 | AssocContainerId::ImplId(id) => AssocItemContainer::Impl(id.into()), |
1068 | AssocContainerId::ContainerId(_) => panic!("invalid AssocItem"), | 1068 | AssocContainerId::ContainerId(_) => panic!("invalid AssocItem"), |
1069 | } | 1069 | } |
1070 | } | 1070 | } |
@@ -1086,7 +1086,7 @@ pub enum GenericDef { | |||
1086 | Adt(Adt), | 1086 | Adt(Adt), |
1087 | Trait(Trait), | 1087 | Trait(Trait), |
1088 | TypeAlias(TypeAlias), | 1088 | TypeAlias(TypeAlias), |
1089 | ImplDef(ImplDef), | 1089 | Impl(Impl), |
1090 | // enum variants cannot have generics themselves, but their parent enums | 1090 | // enum variants cannot have generics themselves, but their parent enums |
1091 | // can, and this makes some code easier to write | 1091 | // can, and this makes some code easier to write |
1092 | EnumVariant(EnumVariant), | 1092 | EnumVariant(EnumVariant), |
@@ -1098,7 +1098,7 @@ impl_from!( | |||
1098 | Adt(Struct, Enum, Union), | 1098 | Adt(Struct, Enum, Union), |
1099 | Trait, | 1099 | Trait, |
1100 | TypeAlias, | 1100 | TypeAlias, |
1101 | ImplDef, | 1101 | Impl, |
1102 | EnumVariant, | 1102 | EnumVariant, |
1103 | Const | 1103 | Const |
1104 | for GenericDef | 1104 | for GenericDef |
@@ -1268,18 +1268,18 @@ impl LifetimeParam { | |||
1268 | 1268 | ||
1269 | // FIXME: rename from `ImplDef` to `Impl` | 1269 | // FIXME: rename from `ImplDef` to `Impl` |
1270 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] | 1270 | #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] |
1271 | pub struct ImplDef { | 1271 | pub struct Impl { |
1272 | pub(crate) id: ImplId, | 1272 | pub(crate) id: ImplId, |
1273 | } | 1273 | } |
1274 | 1274 | ||
1275 | impl ImplDef { | 1275 | impl Impl { |
1276 | pub fn all_in_crate(db: &dyn HirDatabase, krate: Crate) -> Vec<ImplDef> { | 1276 | pub fn all_in_crate(db: &dyn HirDatabase, krate: Crate) -> Vec<Impl> { |
1277 | let inherent = db.inherent_impls_in_crate(krate.id); | 1277 | let inherent = db.inherent_impls_in_crate(krate.id); |
1278 | let trait_ = db.trait_impls_in_crate(krate.id); | 1278 | let trait_ = db.trait_impls_in_crate(krate.id); |
1279 | 1279 | ||
1280 | inherent.all_impls().chain(trait_.all_impls()).map(Self::from).collect() | 1280 | inherent.all_impls().chain(trait_.all_impls()).map(Self::from).collect() |
1281 | } | 1281 | } |
1282 | pub fn for_trait(db: &dyn HirDatabase, krate: Crate, trait_: Trait) -> Vec<ImplDef> { | 1282 | pub fn for_trait(db: &dyn HirDatabase, krate: Crate, trait_: Trait) -> Vec<Impl> { |
1283 | let impls = db.trait_impls_in_crate(krate.id); | 1283 | let impls = db.trait_impls_in_crate(krate.id); |
1284 | impls.for_trait(trait_.id).map(Self::from).collect() | 1284 | impls.for_trait(trait_.id).map(Self::from).collect() |
1285 | } | 1285 | } |
@@ -1904,7 +1904,7 @@ pub enum ScopeDef { | |||
1904 | ModuleDef(ModuleDef), | 1904 | ModuleDef(ModuleDef), |
1905 | MacroDef(MacroDef), | 1905 | MacroDef(MacroDef), |
1906 | GenericParam(TypeParam), | 1906 | GenericParam(TypeParam), |
1907 | ImplSelfType(ImplDef), | 1907 | ImplSelfType(Impl), |
1908 | AdtSelfType(Adt), | 1908 | AdtSelfType(Adt), |
1909 | Local(Local), | 1909 | Local(Local), |
1910 | Unknown, | 1910 | Unknown, |