diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-20 07:06:55 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-12-20 07:06:55 +0000 |
commit | f3125555a8de6fad4529408436800a6b1243a442 (patch) | |
tree | 6cc2943b901f35ea3c351490f15cad9061a69c15 /crates/hir/src/semantics.rs | |
parent | 87886e89867d36c14812e70505c4db61a6b66bf0 (diff) | |
parent | f6ed16674c461cb20c39e787fffab2269b9629b0 (diff) |
Merge #6958
6958: Align code_model name with ungrammar r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/hir/src/semantics.rs')
-rw-r--r-- | crates/hir/src/semantics.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs index 83ec91f58..25ebf73d8 100644 --- a/crates/hir/src/semantics.rs +++ b/crates/hir/src/semantics.rs | |||
@@ -51,7 +51,7 @@ impl PathResolution { | |||
51 | Some(TypeNs::BuiltinType(*builtin)) | 51 | Some(TypeNs::BuiltinType(*builtin)) |
52 | } | 52 | } |
53 | PathResolution::Def(ModuleDef::Const(_)) | 53 | PathResolution::Def(ModuleDef::Const(_)) |
54 | | PathResolution::Def(ModuleDef::EnumVariant(_)) | 54 | | PathResolution::Def(ModuleDef::Variant(_)) |
55 | | PathResolution::Def(ModuleDef::Function(_)) | 55 | | PathResolution::Def(ModuleDef::Function(_)) |
56 | | PathResolution::Def(ModuleDef::Module(_)) | 56 | | PathResolution::Def(ModuleDef::Module(_)) |
57 | | PathResolution::Def(ModuleDef::Static(_)) | 57 | | PathResolution::Def(ModuleDef::Static(_)) |
@@ -715,7 +715,7 @@ to_def_impls![ | |||
715 | (crate::Function, ast::Fn, fn_to_def), | 715 | (crate::Function, ast::Fn, fn_to_def), |
716 | (crate::Field, ast::RecordField, record_field_to_def), | 716 | (crate::Field, ast::RecordField, record_field_to_def), |
717 | (crate::Field, ast::TupleField, tuple_field_to_def), | 717 | (crate::Field, ast::TupleField, tuple_field_to_def), |
718 | (crate::EnumVariant, ast::Variant, enum_variant_to_def), | 718 | (crate::Variant, ast::Variant, enum_variant_to_def), |
719 | (crate::TypeParam, ast::TypeParam, type_param_to_def), | 719 | (crate::TypeParam, ast::TypeParam, type_param_to_def), |
720 | (crate::LifetimeParam, ast::LifetimeParam, lifetime_param_to_def), | 720 | (crate::LifetimeParam, ast::LifetimeParam, lifetime_param_to_def), |
721 | (crate::MacroDef, ast::MacroRules, macro_rules_to_def), | 721 | (crate::MacroDef, ast::MacroRules, macro_rules_to_def), |