about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-12-08 08:51:51 +0000
committerbors <bors@rust-lang.org>2020-12-08 08:51:51 +0000
commit4fd4a98d4788bc987d7f7add9df5f5ead6a1c15e (patch)
tree378707e6768914edfd3d36dfd2d108f64777e9d5
parent5e48ea9a40d94441d76748297bdb565e8fb3db23 (diff)
parent9cc563b70b1e99c26404b059c36f2c66cc91e5f8 (diff)
downloadrust-4fd4a98d4788bc987d7f7add9df5f5ead6a1c15e.tar.gz
rust-4fd4a98d4788bc987d7f7add9df5f5ead6a1c15e.zip
Auto merge of #79806 - LeSeulArtichaut:fixup-filter-is-none, r=jyn514
Fixup: `filter().is_none()` -> `!any()`
-rw-r--r--compiler/rustc_typeck/src/check/pat.rs11
1 files changed, 4 insertions, 7 deletions
diff --git a/compiler/rustc_typeck/src/check/pat.rs b/compiler/rustc_typeck/src/check/pat.rs
index bcb73e1b4e7..5fc573a57ad 100644
--- a/compiler/rustc_typeck/src/check/pat.rs
+++ b/compiler/rustc_typeck/src/check/pat.rs
@@ -1174,7 +1174,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         }
 
         let mut unmentioned_err = None;
-        // Report an error if incorrect number of the fields were specified.
+        // Report an error if an incorrect number of fields was specified.
         if adt.is_union() {
             if fields.len() != 1 {
                 tcx.sess
@@ -1185,12 +1185,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 tcx.sess.struct_span_err(pat.span, "`..` cannot be used in union patterns").emit();
             }
         } else if !etc && !unmentioned_fields.is_empty() {
-            let no_accessible_unmentioned_fields = unmentioned_fields
-                .iter()
-                .find(|(field, _)| {
-                    field.vis.is_accessible_from(tcx.parent_module(pat.hir_id).to_def_id(), tcx)
-                })
-                .is_none();
+            let no_accessible_unmentioned_fields = !unmentioned_fields.iter().any(|(field, _)| {
+                field.vis.is_accessible_from(tcx.parent_module(pat.hir_id).to_def_id(), tcx)
+            });
 
             if no_accessible_unmentioned_fields {
                 unmentioned_err = Some(self.error_no_accessible_fields(pat, &fields));