Supress swapping lhs and rhs in equality suggestion in extern macro by xizheyin · Pull Request #144266 · rust-lang/rust

xizheyin · 2025-07-21T16:10:32Z

compiler-errors · 2025-07-21T16:11:25Z

If the test can't actually demonstrate the change, then there's no reason to make this into two commits. Please squash this into one.

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

xizheyin

Pretty fast review!

@rustbot ready

xizheyin · 2025-07-21T16:16:38Z

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

+            if rhs_expr.span.in_external_macro(sm) || lhs_expr.span.in_external_macro(sm) {
+                return;
+            }
+


Now I checked both.

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

xizheyin · 2025-07-23T04:28:25Z

I submitted #144268. We can find the correct span with the newly added methods, thus not needing to suppress this suggestion.

xizheyin

Now, we could reproduce the bug.
@rustbot ready

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

compiler-errors · 2025-08-14T17:00:28Z

r? compiler

nnethercote · 2025-08-22T06:55:04Z

tests/ui/typeck/sugg-swap-equality-in-macro-issue-139050.rs


 use std::fmt::Debug;

-macro_rules! eq_local {    


You should fix these whitespace issues in the first commit.

nnethercote · 2025-08-22T06:57:09Z

This seems like it's doing what's it's supposed to. But it's papering over a problem, which is that the suggestion to switch the argument is incorrect -- it doesn't fix the problem. And this suggestion seems to be a new one. I don't get it in rust 1.89.0. It would be better if the suggestion wasn't given at all...

Dylan-DPC · 2025-10-03T16:33:50Z

@xizheyin any updates on this? thanks

Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>

rustbot · 2025-10-04T10:08:13Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

xizheyin · 2025-10-04T10:15:55Z

Sorry for slow response! @Dylan-DPC @nnethercote :)

I revised the code. My initial thinking was to provide different and more precise suggestions for user-written external libraries. However, for a minimal change, directly suppressing it is also a good approach.

In this version, I directly suppressed the lhs and rhs from external macros because we cannot obtain precise spans.

Additionally, I fixed the formatting issues in the first commit proposed by @nnethercote .

nnethercote · 2025-10-13T10:01:39Z

@bors r+ rollup

bors · 2025-10-13T10:01:42Z

📌 Commit 94d6601 has been approved by nnethercote

It is now in the queue for this repository.

Supress swapping lhs and rhs in equality suggestion in extern macro Fixes rust-lang#139050

Rollup of 7 pull requests Successful merges: - #144266 (Supress swapping lhs and rhs in equality suggestion in extern macro ) - #147471 (Assert that non-extended temporaries and `super let` bindings have scopes) - #147533 (Renumber return local after state transform) - #147566 (rewrite outlives placeholder constraints to outlives static when handling opaque types) - #147613 (Make logging filters work again by moving EnvFilter into its own layer) - #147615 (reduce calls to attr.span() in old doc attr parsing) - #147636 (miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #144266 - xizheyin:139050, r=nnethercote Supress swapping lhs and rhs in equality suggestion in extern macro Fixes #139050

Rollup of 7 pull requests Successful merges: - rust-lang/rust#144266 (Supress swapping lhs and rhs in equality suggestion in extern macro ) - rust-lang/rust#147471 (Assert that non-extended temporaries and `super let` bindings have scopes) - rust-lang/rust#147533 (Renumber return local after state transform) - rust-lang/rust#147566 (rewrite outlives placeholder constraints to outlives static when handling opaque types) - rust-lang/rust#147613 (Make logging filters work again by moving EnvFilter into its own layer) - rust-lang/rust#147615 (reduce calls to attr.span() in old doc attr parsing) - rust-lang/rust#147636 (miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#144266 (Supress swapping lhs and rhs in equality suggestion in extern macro ) - rust-lang#147471 (Assert that non-extended temporaries and `super let` bindings have scopes) - rust-lang#147533 (Renumber return local after state transform) - rust-lang#147566 (rewrite outlives placeholder constraints to outlives static when handling opaque types) - rust-lang#147613 (Make logging filters work again by moving EnvFilter into its own layer) - rust-lang#147615 (reduce calls to attr.span() in old doc attr parsing) - rust-lang#147636 (miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned compiler-errors Jul 21, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 21, 2025

xizheyin changed the title ~~139050~~ Supress swapping lhs and rhs in equality suggestion in extern macro Jul 21, 2025

compiler-errors suggested changes Jul 21, 2025

View reviewed changes

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs Outdated Show resolved Hide resolved

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 21, 2025

xizheyin force-pushed the 139050 branch 2 times, most recently from 2ec2014 to 749762a Compare July 21, 2025 16:16

xizheyin commented Jul 21, 2025

View reviewed changes

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 21, 2025

compiler-errors reviewed Jul 21, 2025

View reviewed changes

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs Show resolved Hide resolved

This was referenced Jul 28, 2025

Add method find_ancestor_not_from_macro and find_ancestor_not_from_extern_macro to supersede find_oldest_ancestor_in_same_ctxt #144268

Merged

Suggest only Span without source changes when source code is unavailable #144585

Open

xizheyin force-pushed the 139050 branch 2 times, most recently from 3abc2ff to 68ea691 Compare August 7, 2025 11:52

xizheyin commented Aug 7, 2025

View reviewed changes

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs Outdated Show resolved Hide resolved

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

xizheyin force-pushed the 139050 branch from 68ea691 to e73c148 Compare August 7, 2025 13:37

rustbot assigned nnethercote and unassigned compiler-errors Aug 14, 2025

nnethercote reviewed Aug 22, 2025

View reviewed changes

nnethercote added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 22, 2025

xizheyin added 2 commits October 4, 2025 17:54

Add test sugg-swap-equality-in-macro

19331da

Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>

Suppress suggest swapping the equality in extern macro

94d6601

Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>

xizheyin force-pushed the 139050 branch from e73c148 to 94d6601 Compare October 4, 2025 10:08

xizheyin added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 6, 2025

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 13, 2025

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 13, 2025

Rollup merge of rust-lang#144266 - xizheyin:139050, r=nnethercote

08ee944

Supress swapping lhs and rhs in equality suggestion in extern macro Fixes rust-lang#139050

matthiaskrgr mentioned this pull request Oct 13, 2025

Rollup of 7 pull requests #147640

Merged

bors merged commit 8521985 into rust-lang:master Oct 13, 2025
10 checks passed

rustbot added this to the 1.92.0 milestone Oct 13, 2025

rust-timer added a commit that referenced this pull request Oct 13, 2025

Unrolled build for #144266

fbafa95

Rollup merge of #144266 - xizheyin:139050, r=nnethercote Supress swapping lhs and rhs in equality suggestion in extern macro Fixes #139050

Uh oh!

Conversation

xizheyin commented Jul 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

compiler-errors commented Jul 21, 2025

Uh oh!

Uh oh!

xizheyin left a comment

Choose a reason for hiding this comment

Uh oh!

xizheyin Jul 21, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

xizheyin commented Jul 23, 2025

Uh oh!

xizheyin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

compiler-errors commented Aug 14, 2025

Uh oh!

nnethercote Aug 22, 2025

Choose a reason for hiding this comment

Uh oh!

nnethercote commented Aug 22, 2025

Uh oh!

Dylan-DPC commented Oct 3, 2025

Uh oh!

rustbot commented Oct 4, 2025

Uh oh!

xizheyin commented Oct 4, 2025

Uh oh!

nnethercote commented Oct 13, 2025

Uh oh!

bors commented Oct 13, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

xizheyin commented Jul 21, 2025 •

edited

Loading