diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-19 19:07:33 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-01-19 19:07:33 +0000 |
commit | f647e134a785245579da3de04235887a5e958c9b (patch) | |
tree | d0e54ef23ff0714497ac251b6f2e1c7512c092e1 /crates/hir | |
parent | 02edb4b31be02fdab9c970cafb38439f472c0696 (diff) | |
parent | bed12833cc4ce7c6b4085ba8dc47fc167c83f8ea (diff) |
Merge #7351
7351: Show const params in completions r=Veykril a=Veykril
bors r+

Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/hir')
-rw-r--r-- | crates/hir/src/code_model.rs | 2 | ||||
-rw-r--r-- | crates/hir/src/semantics.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir/src/code_model.rs b/crates/hir/src/code_model.rs index 5a4c27906..a4141e111 100644 --- a/crates/hir/src/code_model.rs +++ b/crates/hir/src/code_model.rs | |||
@@ -2046,7 +2046,7 @@ impl Callable { | |||
2046 | pub enum ScopeDef { | 2046 | pub enum ScopeDef { |
2047 | ModuleDef(ModuleDef), | 2047 | ModuleDef(ModuleDef), |
2048 | MacroDef(MacroDef), | 2048 | MacroDef(MacroDef), |
2049 | GenericParam(TypeParam), | 2049 | GenericParam(GenericParam), |
2050 | ImplSelfType(Impl), | 2050 | ImplSelfType(Impl), |
2051 | AdtSelfType(Adt), | 2051 | AdtSelfType(Adt), |
2052 | Local(Local), | 2052 | Local(Local), |
diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs index ab213e04c..0a30b4f5b 100644 --- a/crates/hir/src/semantics.rs +++ b/crates/hir/src/semantics.rs | |||
@@ -814,7 +814,7 @@ impl<'a> SemanticsScope<'a> { | |||
814 | } | 814 | } |
815 | resolver::ScopeDef::ImplSelfType(it) => ScopeDef::ImplSelfType(it.into()), | 815 | resolver::ScopeDef::ImplSelfType(it) => ScopeDef::ImplSelfType(it.into()), |
816 | resolver::ScopeDef::AdtSelfType(it) => ScopeDef::AdtSelfType(it.into()), | 816 | resolver::ScopeDef::AdtSelfType(it) => ScopeDef::AdtSelfType(it.into()), |
817 | resolver::ScopeDef::GenericParam(id) => ScopeDef::GenericParam(TypeParam { id }), | 817 | resolver::ScopeDef::GenericParam(id) => ScopeDef::GenericParam(id.into()), |
818 | resolver::ScopeDef::Local(pat_id) => { | 818 | resolver::ScopeDef::Local(pat_id) => { |
819 | let parent = resolver.body_owner().unwrap().into(); | 819 | let parent = resolver.body_owner().unwrap().into(); |
820 | ScopeDef::Local(Local { parent, pat_id }) | 820 | ScopeDef::Local(Local { parent, pat_id }) |