mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #79806 - LeSeulArtichaut:fixup-filter-is-none, r=jyn514

Browse Source 
Fixup: `filter().is_none()` -> `!any()`
This commit is contained in:
bors 2020-12-08 08:51:51 +00:00
commit 4fd4a98d47
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/rustc_typeck/src/check/pat.rs
View File

@ -1174,7 +1174,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
} }
let mut unmentioned_err = None; 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 adt.is_union() {
if fields.len() != 1 { if fields.len() != 1 {
tcx.sess 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(); tcx.sess.struct_span_err(pat.span, "`..` cannot be used in union patterns").emit();
} }
} else if !etc && !unmentioned_fields.is_empty() { } else if !etc && !unmentioned_fields.is_empty() {
let no_accessible_unmentioned_fields = unmentioned_fields let no_accessible_unmentioned_fields = !unmentioned_fields.iter().any(|(field, _)| {
.iter()
.find(|(field, _)| {
field.vis.is_accessible_from(tcx.parent_module(pat.hir_id).to_def_id(), tcx) field.vis.is_accessible_from(tcx.parent_module(pat.hir_id).to_def_id(), tcx)
}) });
.is_none();
if no_accessible_unmentioned_fields { if no_accessible_unmentioned_fields {
unmentioned_err = Some(self.error_no_accessible_fields(pat, &fields)); unmentioned_err = Some(self.error_no_accessible_fields(pat, &fields));