Skip to content

Commit cc67bcf

Browse files
committed
Auto merge of #149890 - JonathanBrouwer:rollup-1zsm23q, r=JonathanBrouwer
Rollup of 10 pull requests Successful merges: - #142380 (Put negative implementors first and apply same ordering logic to foreign implementors) - #146584 (remove duplicated columns from `rustc_error_code::error_codes!`) - #148717 (Point at span within local macros even when error happens in nested external macro) - #148825 (Add SystemTime::{MIN, MAX}) - #149565 (rustdoc: Add unstable `--merge-doctests=yes/no/auto` flag) - #149770 (Rename some issue-* tests) - #149807 (Use ubuntu:24.04 for the `x86_64-gnu-miri` job) - #149850 (Remove "tidy" tool for `tests/rustdoc` testsuite) - #149863 (Do not suggest moving expression out of for loop when hitting `break` from desugaring) - #149867 (only resolve main in bin crates) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f520900 + 6ed8e68 commit cc67bcf

File tree

125 files changed

+1830
-1094
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+1830
-1094
lines changed

compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4521,7 +4521,9 @@ struct BreakFinder {
45214521
impl<'hir> Visitor<'hir> for BreakFinder {
45224522
fn visit_expr(&mut self, ex: &'hir hir::Expr<'hir>) {
45234523
match ex.kind {
4524-
hir::ExprKind::Break(destination, _) => {
4524+
hir::ExprKind::Break(destination, _)
4525+
if !ex.span.is_desugaring(DesugaringKind::ForLoop) =>
4526+
{
45254527
self.found_breaks.push((destination, ex.span));
45264528
}
45274529
hir::ExprKind::Continue(destination) => {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#### this error code is no longer emitted by the compiler.
1+
#### Note: this error code is no longer emitted by the compiler.
22

33
This was triggered when multiple macro definitions used the same
44
`#[rustc_builtin_macro(..)]`. This is no longer an error.

0 commit comments

Comments
 (0)