diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-16 07:09:30 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-16 07:09:30 +0100 |
commit | 6b33b90091b0cecd4c092d34451aba9f2492063c (patch) | |
tree | dd87d2b240d84fe76fe585442fea1812d0d148dd /crates/ra_hir/src/ty | |
parent | 2d79a1ad83cc39075c7c9e3230973013c8c58b17 (diff) | |
parent | cd8155b7f73006ee7dae8b423557f25fd92912df (diff) |
Merge #1852
1852: Gracefully handle `const _` items in `ConstData` r=ecstatic-morse a=ecstatic-morse
A follow-up to #1847.
This makes the `name` field of `ConstData` optional.
Co-authored-by: Dylan MacKenzie <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty')
-rw-r--r-- | crates/ra_hir/src/ty/infer.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs index bf57bb3b7..7d9b86752 100644 --- a/crates/ra_hir/src/ty/infer.rs +++ b/crates/ra_hir/src/ty/infer.rs | |||
@@ -577,7 +577,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
577 | 577 | ||
578 | crate::ImplItem::Const(konst) => { | 578 | crate::ImplItem::Const(konst) => { |
579 | let data = konst.data(self.db); | 579 | let data = konst.data(self.db); |
580 | if segment.name == *data.name() { | 580 | if Some(&segment.name) == data.name() { |
581 | Some(ValueNs::Const(konst)) | 581 | Some(ValueNs::Const(konst)) |
582 | } else { | 582 | } else { |
583 | None | 583 | None |