Parser: Recover error from named params while parse_path #140671

xizheyin · 2025-05-05T15:24:55Z

Fixes #140169

I added test to the first commit and the second added the code and changes to test.

r? @petrochenkov

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

tests/ui/impl-trait/impl-fn-parsing-ambiguities.stderr

compiler/rustc_parse/src/parser/ty.rs

compiler-errors · 2025-05-05T19:02:21Z

@rustbot author

rustbot · 2025-05-05T19:02:25Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

xizheyin

@rustbot ready

compiler/rustc_parse/src/parser/path.rs

compiler/rustc_parse/messages.ftl

compiler/rustc_parse/src/parser/path.rs

xizheyin

@rustbot ready

tests/ui/fn/fn-trait-use-named-params-issue-140169.stderr

compiler/rustc_parse/src/parser/item.rs

tests/ui/fn/fn-trait-use-named-params-issue-140169.rs

compiler/rustc_parse/src/parser/item.rs

compiler/rustc_parse/src/parser/path.rs

xizheyin · 2025-05-06T15:21:49Z

@rustbot ready

compiler/rustc_parse/messages.ftl

compiler/rustc_parse/src/parser/path.rs

petrochenkov · 2025-05-07T10:33:08Z

Could you also squash commits after addressing #140671 (comment)?
@rustbot author

…ment` Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn> Co-authored-by: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>

xizheyin · 2025-05-07T15:01:04Z

@rustbot ready

I revised the code and squashed the commits.

petrochenkov · 2025-05-07T15:06:35Z

Thanks!
@bors r+

bors · 2025-05-07T15:06:38Z

📌 Commit b922da3 has been approved by petrochenkov

It is now in the queue for this repository.

…llaumeGomez Rollup of 8 pull requests Successful merges: - rust-lang#140234 (Separate dataflow analysis and results) - rust-lang#140614 (Correct warning message in restricted visibility) - rust-lang#140671 (Parser: Recover error from named params while parse_path) - rust-lang#140700 (Don't crash on error codes passed to `--explain` which exceed our internal limit of 9999 ) - rust-lang#140706 ([rustdoc] Ensure that temporary doctest folder is correctly removed even if doctests failed) - rust-lang#140734 (Fix regression from rust-lang#140393 for espidf / horizon / nuttx / vita) - rust-lang#140741 (add armv5te-unknown-linux-gnueabi target maintainer) - rust-lang#140745 (run-make-support: set rustc dylib path for cargo wrapper) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#140671 - xizheyin:issue-140169, r=petrochenkov Parser: Recover error from named params while parse_path Fixes rust-lang#140169 I added test to the first commit and the second added the code and changes to test. r? `@petrochenkov`

Add ui test fn-trait-use-named-params

896cf80

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

rustbot assigned petrochenkov May 5, 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 May 5, 2025

This comment has been minimized.

Sign in to view

compiler-errors requested changes May 5, 2025

View reviewed changes

tests/ui/impl-trait/impl-fn-parsing-ambiguities.stderr Outdated Show resolved Hide resolved

compiler/rustc_parse/src/parser/ty.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 May 5, 2025

xizheyin force-pushed the issue-140169 branch from 1e193e9 to aa8d798 Compare May 6, 2025 07:48

xizheyin commented May 6, 2025

View reviewed changes

compiler/rustc_parse/src/parser/path.rs Outdated Show resolved Hide resolved

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 6, 2025

xizheyin changed the title ~~Recover from Fn, FnOnce, FnMut trait with named params~~ Parser: Recover error from named params while parse_path May 6, 2025

This comment has been minimized.

Sign in to view

xizheyin force-pushed the issue-140169 branch from aa8d798 to c643bb2 Compare May 6, 2025 08:52

petrochenkov reviewed May 6, 2025

View reviewed changes

compiler/rustc_parse/messages.ftl Outdated Show resolved Hide resolved

compiler/rustc_parse/messages.ftl Outdated Show resolved Hide resolved

compiler/rustc_parse/src/parser/path.rs Outdated Show resolved Hide resolved

petrochenkov 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 May 6, 2025

This comment has been minimized.

Sign in to view

xizheyin commented May 6, 2025

View reviewed changes

tests/ui/fn/fn-trait-use-named-params-issue-140169.stderr Outdated Show resolved Hide resolved

compiler/rustc_parse/src/parser/item.rs Show resolved Hide resolved

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 6, 2025

petrochenkov reviewed May 6, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

petrochenkov 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 May 6, 2025

xizheyin force-pushed the issue-140169 branch from a578263 to 8ee1863 Compare May 6, 2025 14:18

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 6, 2025

compiler-errors requested changes May 6, 2025

View reviewed changes

compiler/rustc_parse/messages.ftl Outdated Show resolved Hide resolved

compiler/rustc_parse/messages.ftl Outdated Show resolved Hide resolved

compiler/rustc_parse/messages.ftl Outdated Show resolved Hide resolved

xizheyin force-pushed the issue-140169 branch from 8ee1863 to 1c4b9ec Compare May 6, 2025 16:13

petrochenkov reviewed May 7, 2025

View reviewed changes

compiler/rustc_parse/src/parser/path.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 May 7, 2025

Use parse_param_general when parsing (T, U)->R in `parse_path_seg…

b922da3

…ment` Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn> Co-authored-by: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>

xizheyin force-pushed the issue-140169 branch from 1c4b9ec to b922da3 Compare May 7, 2025 14:58

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 7, 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 May 7, 2025

GuillaumeGomez mentioned this pull request May 7, 2025

Rollup of 8 pull requests #140751

Merged

bors merged commit 32325e1 into rust-lang:master May 8, 2025
6 checks passed

rustbot added this to the 1.88.0 milestone May 8, 2025

xizheyin deleted the issue-140169 branch June 1, 2025 06:25

Parser: Recover error from named params while parse_path #140671

Parser: Recover error from named params while parse_path #140671

Uh oh!

Conversation

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

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

compiler-errors commented May 5, 2025

Uh oh!

rustbot commented May 5, 2025

Uh oh!

xizheyin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

xizheyin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

xizheyin commented May 6, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented May 7, 2025

Uh oh!

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

Uh oh!

Uh oh!

petrochenkov commented May 7, 2025

Uh oh!

bors commented May 7, 2025

Uh oh!

Uh oh!

Uh oh!

xizheyin commented May 5, 2025 •

edited

Loading

xizheyin commented May 7, 2025 •

edited

Loading