diff options
| author | Jason Newcomb <jsnewcomb@pm.me> | 2022-03-15 21:51:07 -0400 |
|---|---|---|
| committer | Jason Newcomb <jsnewcomb@pm.me> | 2022-03-15 21:51:07 -0400 |
| commit | e71ac41d44fd2fdffcb94f6000ad2cffad5c61cd (patch) | |
| tree | 12e6b5e0c4dcafd95b6c9e9962b16b448689f6f7 | |
| parent | b83c6323c7d788fe4b6921b000324fb09945e12b (diff) | |
| download | rust-e71ac41d44fd2fdffcb94f6000ad2cffad5c61cd.tar.gz rust-e71ac41d44fd2fdffcb94f6000ad2cffad5c61cd.zip | |
Fix `transmute_undefined_repr` for single element tuples
| -rw-r--r-- | clippy_lints/src/transmute/transmute_undefined_repr.rs | 5 | ||||
| -rw-r--r-- | tests/ui/transmute_undefined_repr.rs | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/clippy_lints/src/transmute/transmute_undefined_repr.rs b/clippy_lints/src/transmute/transmute_undefined_repr.rs index 6edff224092..3cd9d208943 100644 --- a/clippy_lints/src/transmute/transmute_undefined_repr.rs +++ b/clippy_lints/src/transmute/transmute_undefined_repr.rs @@ -282,10 +282,11 @@ fn reduce_ty<'tcx>(cx: &LateContext<'tcx>, mut ty: Ty<'tcx>) -> ReducedTy<'tcx> }, ty::Tuple(args) if args.is_empty() => ReducedTy::TypeErasure, ty::Tuple(args) => { - let Some(sized_ty) = args.iter().find(|&ty| !is_zero_sized_ty(cx, ty)) else { + let mut iter = args.iter(); + let Some(sized_ty) = iter.find(|&ty| !is_zero_sized_ty(cx, ty)) else { return ReducedTy::OrderedFields(ty); }; - if args.iter().all(|ty| is_zero_sized_ty(cx, ty)) { + if iter.all(|ty| is_zero_sized_ty(cx, ty)) { ty = sized_ty; continue; } diff --git a/tests/ui/transmute_undefined_repr.rs b/tests/ui/transmute_undefined_repr.rs index b163d605634..e7a59dbed95 100644 --- a/tests/ui/transmute_undefined_repr.rs +++ b/tests/ui/transmute_undefined_repr.rs @@ -87,5 +87,14 @@ fn main() { let _: *const [u8] = transmute(value::<Box<[u8]>>()); // Ok let _: Box<[u8]> = transmute(value::<*mut [u8]>()); // Ok + + let _: Ty2<u32, u32> = transmute(value::<(Ty2<u32, u32>,)>()); // Ok + let _: (Ty2<u32, u32>,) = transmute(value::<Ty2<u32, u32>>()); // Ok + + let _: Ty2<u32, u32> = transmute(value::<(Ty2<u32, u32>, ())>()); // Ok + let _: (Ty2<u32, u32>, ()) = transmute(value::<Ty2<u32, u32>>()); // Ok + + let _: Ty2<u32, u32> = transmute(value::<((), Ty2<u32, u32>)>()); // Ok + let _: ((), Ty2<u32, u32>) = transmute(value::<Ty2<u32, u32>>()); // Ok } } |
