Add lifetime_capture_rules_2024

2023-10-19 19:00:18 +00:00
parent ec94480d98
commit 0ad160a585
8 changed files with 71 additions and 8 deletions
--- a/compiler/rustc_ast_lowering/src/lib.rs
+++ b/compiler/rustc_ast_lowering/src/lib.rs
@@ -1571,8 +1571,10 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                Vec::new()
            }
            hir::OpaqueTyOrigin::FnReturn(..) => {
-                if let FnDeclKind::Impl | FnDeclKind::Trait =
-                    fn_kind.expect("expected RPITs to be lowered with a FnKind")
+                if matches!(
+                    fn_kind.expect("expected RPITs to be lowered with a FnKind"),
+                    FnDeclKind::Impl | FnDeclKind::Trait
+                ) || self.tcx.features().lifetime_capture_rules_2024
                {
                    // return-position impl trait in trait was decided to capture all
                    // in-scope lifetimes, which we collect for all opaques during resolution.