diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-24 14:36:31 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-24 14:36:31 +0000 |
commit | 775bd98e5cf7918acf0dd72009ac14cf758ed0ca (patch) | |
tree | bb4e9795f9dc23d710f147faff02e9d8df596d87 /crates/ra_hir/src/code_model.rs | |
parent | 5cc634fa6018b60c7bac5ada2038ca341a91f410 (diff) | |
parent | 21cfa6d529babf868f897b943d67561ea752b9e5 (diff) |
Merge #2385
2385: Some docs r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/code_model.rs')
-rw-r--r-- | crates/ra_hir/src/code_model.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index 905bb5bcb..b3e2ff1c2 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs | |||
@@ -1037,7 +1037,7 @@ impl From<PerNs> for ScopeDef { | |||
1037 | .or_else(|| def.take_values()) | 1037 | .or_else(|| def.take_values()) |
1038 | .map(|module_def_id| ScopeDef::ModuleDef(module_def_id.into())) | 1038 | .map(|module_def_id| ScopeDef::ModuleDef(module_def_id.into())) |
1039 | .or_else(|| { | 1039 | .or_else(|| { |
1040 | def.get_macros().map(|macro_def_id| ScopeDef::MacroDef(macro_def_id.into())) | 1040 | def.take_macros().map(|macro_def_id| ScopeDef::MacroDef(macro_def_id.into())) |
1041 | }) | 1041 | }) |
1042 | .unwrap_or(ScopeDef::Unknown) | 1042 | .unwrap_or(ScopeDef::Unknown) |
1043 | } | 1043 | } |