Auto merge of #122960 - ehuss:edition-2024-crater-test, r=<try>

Crater 2024 edition test
rust-lang · Mar 29, 2024 · 36dbcae · 36dbcae
2 parents af4a5a1 + 561eebd
commit 36dbcae
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 69 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,7 +4,8 @@
 	shallow = true
 [submodule "src/tools/cargo"]
 	path = src/tools/cargo
-	url = https://github.com/rust-lang/cargo.git
+	url = https://github.com/ehuss/cargo.git
+	branch = "edition-2024-crater"
 	shallow = true
 [submodule "src/doc/reference"]
 	path = src/doc/reference

diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/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.

diff --git a/compiler/rustc_hir_analysis/src/check/errs.rs b/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 },
+    );
+    // }
 }
diff --git a/compiler/rustc_hir_analysis/src/errors.rs b/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)]

diff --git a/compiler/rustc_parse/src/parser/expr.rs b/compiler/rustc_parse/src/parser/expr.rs
@@ -1521,15 +1521,15 @@ impl<'a> Parser<'a> {
                 Ok(this.mk_expr(this.prev_token.span, ExprKind::Underscore))
             } else if this.token.uninterpolated_span().at_least_rust_2018() {
                 // `Span::at_least_rust_2018()` is somewhat expensive; don't get it repeatedly.
-                if this.token.uninterpolated_span().at_least_rust_2024()
-                    // check for `gen {}` and `gen move {}`
-                    // or `async gen {}` and `async gen move {}`
-                    && (this.is_gen_block(kw::Gen, 0)
-                        || (this.check_keyword(kw::Async) && this.is_gen_block(kw::Gen, 1)))
-                {
-                    // FIXME: (async) gen closures aren't yet parsed.
-                    this.parse_gen_block()
-                } else if this.check_keyword(kw::Async) {
+                // if this.token.uninterpolated_span().at_least_rust_2024()
+                //     // check for `gen {}` and `gen move {}`
+                //     // or `async gen {}` and `async gen move {}`
+                //     && (this.is_gen_block(kw::Gen, 0)
+                //         || (this.check_keyword(kw::Async) && this.is_gen_block(kw::Gen, 1)))
+                // {
+                //     // FIXME: (async) gen closures aren't yet parsed.
+                //     this.parse_gen_block()
+                if this.check_keyword(kw::Async) {
                     // FIXME(gen_blocks): Parse `gen async` and suggest swap
                     if this.is_gen_block(kw::Async, 0) {
                         // Check for `async {` and `async move {`,

diff --git a/compiler/rustc_parse/src/parser/mod.rs b/compiler/rustc_parse/src/parser/mod.rs
@@ -1201,14 +1201,14 @@ impl<'a> Parser<'a> {
                     return_impl_trait_id: DUMMY_NODE_ID,
                 })
             }
-        } else if self.token.uninterpolated_span().at_least_rust_2024()
-            && self.eat_keyword_case(kw::Gen, case)
-        {
-            Some(CoroutineKind::Gen {
-                span,
-                closure_id: DUMMY_NODE_ID,
-                return_impl_trait_id: DUMMY_NODE_ID,
-            })
+        // } else if self.token.uninterpolated_span().at_least_rust_2024()
+        //     && self.eat_keyword_case(kw::Gen, case)
+        // {
+        //     Some(CoroutineKind::Gen {
+        //         span,
+        //         closure_id: DUMMY_NODE_ID,
+        //         return_impl_trait_id: DUMMY_NODE_ID,
+        //     })
         } else {
             None
         }

diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs
@@ -2407,7 +2407,7 @@ impl Symbol {
 
     fn is_unused_keyword_conditional(self, edition: impl Copy + FnOnce() -> Edition) -> bool {
         self == kw::Try && edition().at_least_rust_2018()
-            || self == kw::Gen && edition().at_least_rust_2024()
+        // || self == kw::Gen && edition().at_least_rust_2024()
     }
 
     pub fn is_reserved(self, edition: impl Copy + FnOnce() -> Edition) -> bool {

diff --git a/src/tools/cargo b/src/tools/cargo