commit 6204a73efa9cc2f669186531849a656978c2f28c
author Manish Goregaokar <manishsmail@gmail.com> Sat Jul 11 08:53:25 2020 -0700
committer GitHub <noreply@github.com> Sat Jul 11 08:53:25 2020 -0700
tree a0f6606dbb5b327b19764ddb9b69af5e12ed2f5b
parent e15fa4537cfa0b53e62ab627f34d98bcd5d3476c
parent 1fb0ed0e2ce788d8f69969bdb81967ca3c9a7f26

Rollup merge of #74213 - pickfire:patch-1, r=jonas-schievink

Minor refactor for rustc_resolve diagnostics match

Use `matches!` instead of old `if let`

src/librustc_resolve/late/diagnostics.rs

diff --git a/src/librustc_resolve/late/diagnostics.rs b/src/librustc_resolve/late/diagnostics.rs
index 976a10e..fc41ce5 100644
--- a/src/librustc_resolve/late/diagnostics.rs
+++ b/src/librustc_resolve/late/diagnostics.rs
@@ -100,9 +100,7 @@
         let ident_span = path.last().map_or(span, |ident| ident.ident.span);
         let ns = source.namespace();
         let is_expected = &|res| source.is_expected(res);
-        let is_enum_variant = &|res| {
-            if let Res::Def(DefKind::Variant, _) = res { true } else { false }
-        };
+        let is_enum_variant = &|res| matches!(res, Res::Def(DefKind::Variant, _));
 
         // Make the base error.
         let expected = source.descr_expected();