Merge branch 'rust-lang:main' into main

Author: jkelley129

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

@@ -4521,7 +4521,9 @@ struct BreakFinder {
 impl<'hir> Visitor<'hir> for BreakFinder {
     fn visit_expr(&mut self, ex: &'hir hir::Expr<'hir>) {
         match ex.kind {
-            hir::ExprKind::Break(destination, _) => {
+            hir::ExprKind::Break(destination, _)
+                if !ex.span.is_desugaring(DesugaringKind::ForLoop) =>
+            {
                 self.found_breaks.push((destination, ex.span));
             }
             hir::ExprKind::Continue(destination) => {

compiler/rustc_error_codes/src/error_codes/E0773.md

@@ -1,4 +1,4 @@
-#### this error code is no longer emitted by the compiler.
+#### Note: this error code is no longer emitted by the compiler.
 
 This was triggered when multiple macro definitions used the same
 `#[rustc_builtin_macro(..)]`. This is no longer an error.