Skip to content

Do not suggest compatible variants inside macro#142611

Open
xizheyin wants to merge 2 commits into
rust-lang:mainfrom
xizheyin:142359
Open

Do not suggest compatible variants inside macro#142611
xizheyin wants to merge 2 commits into
rust-lang:mainfrom
xizheyin:142359

Conversation

@xizheyin
Copy link
Copy Markdown
Member

@xizheyin xizheyin commented Jun 17, 2025 •
edited by rustbot
Loading

Fixes #142359

r? compiler

@rustbot 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 Jun 17, 2025
@BoxyUwU
Copy link
Copy Markdown
Member

BoxyUwU commented Jun 23, 2025 •
edited
Loading

The test doesn't seem to actually reproduce the issue that this fixes? It never suggested to modify std in the first commit. What's up with that

@xizheyin
Copy link
Copy Markdown
Member Author

xizheyin commented Jun 23, 2025

This may be because #139316 (comment).

@xizheyin
Copy link
Copy Markdown
Member Author

xizheyin commented Jul 15, 2025

r? compiler

@rustbot rustbot assigned compiler-errors and unassigned BoxyUwU Jul 15, 2025
compiler-errors
compiler-errors suggested changes Jul 16, 2025
View reviewed changes
Comment thread compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs Outdated
@rustbot 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 16, 2025
@xizheyin xizheyin force-pushed the 142359 branch 2 times, most recently from 740b701 to 6f33a8f Compare July 20, 2025 12:34
xizheyin
xizheyin commented Jul 20, 2025
View reviewed changes
Copy link
Copy Markdown
Member Author

@xizheyin xizheyin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rustbot ready

Comment thread compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs
Comment on lines 2420 to +2426
while let hir::ExprKind::Block(block, _) = &expr.kind
&& let Some(expr_) = &block.expr
// Only traverse blocks in same context
&& expr_.span.eq_ctxt(expr.span)
Copy link
Copy Markdown
Member Author

@xizheyin xizheyin Jul 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This time, I find the deepest expression in the block tree while staying within the same context. This ensures that suggestions point to user-visible code.

@rustbot 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 20, 2025
@fee1-dead
Copy link
Copy Markdown
Member

fee1-dead commented Jul 25, 2025

your first commit hasn't even reproduced the issue, please make sure you can reproduce it before attempting a fix

@fee1-dead
Copy link
Copy Markdown
Member

fee1-dead commented Jul 25, 2025

if the ui test environment doesn't provide std sources, then we need a configuration that does provide std sources to reproduce

@xizheyin

This comment was marked as outdated.

Sign in to view
@xizheyin
Copy link
Copy Markdown
Member Author

xizheyin commented Jul 28, 2025

I open #144585 to provide std sources in ui tests.

@jieyouxu
Copy link
Copy Markdown
Member

jieyouxu commented Jul 28, 2025 •
edited
Loading

if the ui test environment doesn't provide std sources, then we need a configuration that does provide std sources to reproduce

Does this actually need std sources? Can you use an auxiliary such that to the main test, it would be considered e.g. from external macro? (As @estebank recommends in #131782 (comment))

@xizheyin
Copy link
Copy Markdown
Member Author

xizheyin commented Jul 28, 2025

I seem to have find the problem. The root of the problem seems to be the different implementations of span_note and span_help.

@compiler-errors
Copy link
Copy Markdown
Contributor

compiler-errors commented Aug 14, 2025

r? jieyouxu

@rustbot rustbot assigned jieyouxu and unassigned compiler-errors Aug 14, 2025
@jieyouxu
Copy link
Copy Markdown
Member

jieyouxu commented Aug 15, 2025

The regression test doesn't reproduce the regression yet so
@rustbot author

@rustbot 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 Aug 15, 2025
@xizheyin
Copy link
Copy Markdown
Member Author

xizheyin commented Aug 16, 2025

Yeah, since #144585 hasn't been finalized yet, I'll reproduce it by defining extern crate in the UI test.

@Dylan-DPC
Copy link
Copy Markdown
Member

Dylan-DPC commented Apr 3, 2026

@xizheyin any updates on this? thanks

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented May 24, 2026

This PR was rebased onto a different main 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
Copy link
Copy Markdown
Member Author

xizheyin commented May 24, 2026

Updated the regression test to use an auxiliary external macro. The first commit suggests editing inside the external macro, while second commit fix it making it stays at the macro callsite.

@rustbot ready

@rustbot 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 May 24, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@compiler-errors compiler-errors compiler-errors requested changes

Reviewers whose approvals may not affect merge requirements

At least 1 approving review is required to merge this pull request.

Assignees

@jieyouxu jieyouxu

Labels

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Incorrect suggestion for incompatible match arm types

7 participants

@xizheyin @BoxyUwU @fee1-dead @jieyouxu @compiler-errors @Dylan-DPC @rustbot