Disable rpit lifetime capture and static_mut_refs

Author: ehuss

compiler/rustc_ast_lowering/src/lib.rs

@@ -1540,8 +1540,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                 if matches!(
                     fn_kind.expect("expected RPITs to be lowered with a FnKind"),
                     FnDeclKind::Impl | FnDeclKind::Trait
-                ) || self.tcx.features().lifetime_capture_rules_2024
-                    || span.at_least_rust_2024()
+                ) || (self.tcx.features().lifetime_capture_rules_2024
+                    && span.at_least_rust_2024())
                 {
                     // return-position impl trait in trait was decided to capture all
                     // in-scope lifetimes, which we collect for all opaques during resolution.

compiler/rustc_hir_analysis/src/check/errs.rs

@@ -52,28 +52,28 @@ fn handle_static_mut_ref(
     tcx: TyCtxt<'_>,
     span: Span,
     var: String,
-    e2024: bool,
+    _e2024: bool,
     mutable: Mutability,
     hir_id: hir::HirId,
 ) {
-    if e2024 {
-        let (sugg, shared) = if mutable == Mutability::Mut {
-            (errors::StaticMutRefSugg::Mut { span, var }, "mutable")
-        } else {
-            (errors::StaticMutRefSugg::Shared { span, var }, "shared")
-        };
-        tcx.sess.psess.dcx.emit_err(errors::StaticMutRef { span, sugg, shared });
+    // if e2024 {
+    //     let (sugg, shared) = if mutable == Mutability::Mut {
+    //         (errors::StaticMutRefSugg::Mut { span, var }, "mutable")
+    //     } else {
+    //         (errors::StaticMutRefSugg::Shared { span, var }, "shared")
+    //     };
+    //     tcx.sess.psess.dcx.emit_err(errors::StaticMutRef { span, sugg, shared });
+    // } else {
+    let (sugg, shared) = if mutable == Mutability::Mut {
+        (errors::RefOfMutStaticSugg::Mut { span, var }, "mutable")
     } else {
-        let (sugg, shared) = if mutable == Mutability::Mut {
-            (errors::RefOfMutStaticSugg::Mut { span, var }, "mutable")
-        } else {
-            (errors::RefOfMutStaticSugg::Shared { span, var }, "shared")
-        };
-        tcx.emit_node_span_lint(
-            STATIC_MUT_REFS,
-            hir_id,
-            span,
-            errors::RefOfMutStatic { span, sugg, shared },
-        );
-    }
+        (errors::RefOfMutStaticSugg::Shared { span, var }, "shared")
+    };
+    tcx.emit_node_span_lint(
+        STATIC_MUT_REFS,
+        hir_id,
+        span,
+        errors::RefOfMutStatic { span, sugg, shared },
+    );
+    // }
 }

compiler/rustc_hir_analysis/src/errors.rs

@@ -1498,36 +1498,36 @@ pub struct StaticMutRef<'a> {
     #[primary_span]
     #[label]
     pub span: Span,
-    #[subdiagnostic]
-    pub sugg: StaticMutRefSugg,
+    // #[subdiagnostic]
+    // pub sugg: StaticMutRefSugg,
     pub shared: &'a str,
 }
 
-#[derive(Subdiagnostic)]
-pub enum StaticMutRefSugg {
-    #[suggestion(
-        hir_analysis_suggestion,
-        style = "verbose",
-        code = "addr_of!({var})",
-        applicability = "maybe-incorrect"
-    )]
-    Shared {
-        #[primary_span]
-        span: Span,
-        var: String,
-    },
-    #[suggestion(
-        hir_analysis_suggestion_mut,
-        style = "verbose",
-        code = "addr_of_mut!({var})",
-        applicability = "maybe-incorrect"
-    )]
-    Mut {
-        #[primary_span]
-        span: Span,
-        var: String,
-    },
-}
+// #[derive(Subdiagnostic)]
+// pub enum StaticMutRefSugg {
+//     #[suggestion(
+//         hir_analysis_suggestion,
+//         style = "verbose",
+//         code = "addr_of!({var})",
+//         applicability = "maybe-incorrect"
+//     )]
+//     Shared {
+//         #[primary_span]
+//         span: Span,
+//         var: String,
+//     },
+//     #[suggestion(
+//         hir_analysis_suggestion_mut,
+//         style = "verbose",
+//         code = "addr_of_mut!({var})",
+//         applicability = "maybe-incorrect"
+//     )]
+//     Mut {
+//         #[primary_span]
+//         span: Span,
+//         var: String,
+//     },
+// }
 
 // STATIC_MUT_REF lint
 #[derive(LintDiagnostic)]