diff options
| author | bors <bors@rust-lang.org> | 2024-04-04 17:50:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-04 17:50:22 +0000 |
| commit | 9725c4a162502a02c1c67fdca6b797fe09b2b73c (patch) | |
| tree | 6c46b3f31a18f2773ae2683c588898c4fa4d9415 /clippy_lints/src/loops/explicit_iter_loop.rs | |
| parent | 5a9e9b0e65d27bb294a5e13ca554878b43af6224 (diff) | |
| parent | bb023e90d8dfbdee714aa33cfa44b91753a99a03 (diff) | |
Auto merge of #12632 - flip1995:rustup, r=flip1995
Rustup r? `@ghost` changelog: none
Diffstat (limited to 'clippy_lints/src/loops/explicit_iter_loop.rs')
| -rw-r--r-- | clippy_lints/src/loops/explicit_iter_loop.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clippy_lints/src/loops/explicit_iter_loop.rs b/clippy_lints/src/loops/explicit_iter_loop.rs index 814ccaa36f5..eea5f2a94ea 100644 --- a/clippy_lints/src/loops/explicit_iter_loop.rs +++ b/clippy_lints/src/loops/explicit_iter_loop.rs @@ -10,7 +10,7 @@ use rustc_errors::Applicability; use rustc_hir::{Expr, Mutability}; use rustc_lint::LateContext; use rustc_middle::ty::adjustment::{Adjust, Adjustment, AutoBorrow, AutoBorrowMutability}; -use rustc_middle::ty::{self, EarlyBinder, Ty, TypeAndMut}; +use rustc_middle::ty::{self, EarlyBinder, Ty}; use rustc_span::sym; pub(super) fn check( @@ -160,7 +160,7 @@ fn is_ref_iterable<'tcx>( let self_ty = if mutbl.is_mut() { self_ty } else { - Ty::new_ref(cx.tcx, region, TypeAndMut { ty, mutbl }) + Ty::new_ref(cx.tcx, region, ty, mutbl) }; if implements_trait(cx, self_ty, trait_id, &[]) && let Some(ty) = @@ -175,7 +175,7 @@ fn is_ref_iterable<'tcx>( && !self_ty.is_ref() { // Attempt to borrow - let self_ty = Ty::new_ref(cx.tcx, cx.tcx.lifetimes.re_erased, TypeAndMut { ty: self_ty, mutbl }); + let self_ty = Ty::new_ref(cx.tcx, cx.tcx.lifetimes.re_erased, self_ty, mutbl); if implements_trait(cx, self_ty, trait_id, &[]) && let Some(ty) = make_normalized_projection(cx.tcx, cx.param_env, trait_id, sym!(IntoIter), [self_ty]) && ty == res_ty |