bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fixup: filter().is_none() -> !any()

Browse source
This commit is contained in:
LeSeulArtichaut 2020-12-07 21:40:20 +01:00
parent 2b76c48328
commit 9cc563b70b
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
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() field.vis.is_accessible_from(tcx.parent_module(pat.hir_id).to_def_id(), tcx)
.find(|(field, _)| { });
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));