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

Rollup merge of #85906 - LingMan:iter_find, r=matthewjasper

Browse Source 
Use `Iterator::find` instead of open-coding it

```@rustbot``` modify labels +C-cleanup +T-compiler
This commit is contained in:
Yuki Okushi 2021-06-08 13:26:28 +09:00 committed by GitHub
commit 472dbec026
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/rustc_lint/src/types.rs
View File

@ -679,16 +679,11 @@ pub fn transparent_newtype_field<'a, 'tcx>(
variant: &'a ty::VariantDef, variant: &'a ty::VariantDef,
) -> Option<&'a ty::FieldDef> { ) -> Option<&'a ty::FieldDef> {
let param_env = tcx.param_env(variant.def_id); let param_env = tcx.param_env(variant.def_id);
for field in &variant.fields { variant.fields.iter().find(|field| {
let field_ty = tcx.type_of(field.did); let field_ty = tcx.type_of(field.did);
let is_zst = tcx.layout_of(param_env.and(field_ty)).map_or(false, |layout| layout.is_zst()); let is_zst = tcx.layout_of(param_env.and(field_ty)).map_or(false, |layout| layout.is_zst());
!is_zst
if !is_zst { })
return Some(field);
}
}
None
} }
/// Is type known to be non-null? /// Is type known to be non-null?