about summary refs log tree commit diff
path: root/compiler/rustc_ty_utils/src/layout
diff options
context:
space:
mode:
authorJacob Pratt <jacob@jhpratt.dev>2025-02-23 02:44:18 -0500
committerGitHub <noreply@github.com>2025-02-23 02:44:18 -0500
commit7f14d2eba48addfbd398c784e43fd7875e313d74 (patch)
tree2f50960bce1ff03ec088ef071b118549045566ba /compiler/rustc_ty_utils/src/layout
parent2ff53a293e6dde5344a1f02c41dc9043816b8271 (diff)
parent12e3911d81034864314503b9c2d9fba2773c7904 (diff)
downloadrust-7f14d2eba48addfbd398c784e43fd7875e313d74.tar.gz
rust-7f14d2eba48addfbd398c784e43fd7875e313d74.zip
Rollup merge of #137334 - compiler-errors:edition-2024-fresh-2, r=saethlin,traviscross
Greatly simplify lifetime captures in edition 2024

Remove most of the `+ Captures` and `+ '_` from the compiler, since they are now unnecessary with the new edition 2021 lifetime capture rules. Use some `+ 'tcx` and `+ 'static` rather than being overly verbose with precise capturing syntax.
Diffstat (limited to 'compiler/rustc_ty_utils/src/layout')
-rw-r--r--compiler/rustc_ty_utils/src/layout/invariant.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_ty_utils/src/layout/invariant.rs b/compiler/rustc_ty_utils/src/layout/invariant.rs
index cbbe993b62f..c695e2887fd 100644
--- a/compiler/rustc_ty_utils/src/layout/invariant.rs
+++ b/compiler/rustc_ty_utils/src/layout/invariant.rs
@@ -33,7 +33,7 @@ pub(super) fn layout_sanity_check<'tcx>(cx: &LayoutCx<'tcx>, layout: &TyAndLayou
     fn non_zst_fields<'tcx, 'a>(
         cx: &'a LayoutCx<'tcx>,
         layout: &'a TyAndLayout<'tcx>,
-    ) -> impl Iterator<Item = (Size, TyAndLayout<'tcx>)> + 'a {
+    ) -> impl Iterator<Item = (Size, TyAndLayout<'tcx>)> {
         (0..layout.layout.fields().count()).filter_map(|i| {
             let field = layout.field(cx, i);
             // Also checking `align == 1` here leads to test failures in