Skip to content

Try to recover from path sep error in type parsing - #136808

Merged
bors merged 1 commit into
rust-lang:masterfrom
chenyukang:yukang-fix-arg-list-error-129273
Feb 16, 2025
Merged

Try to recover from path sep error in type parsing#136808
bors merged 1 commit into
rust-lang:masterfrom
chenyukang:yukang-fix-arg-list-error-129273

Conversation

@chenyukang

@chenyukangchenyukang commented Feb 10, 2025•
edited
Loading

Copy link
Copy Markdown
Member

Fixes#129273

Error using : in the argument list may mess up the parser.

case tests/ui/suggestions/struct-field-type-including-single-colon also changed, seems it's the same meaning, should be OK.

r? @estebank

@rustbotrustbot 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 Feb 10, 2025
@chenyukangchenyukang changed the title Try to recover from path sep error in parserTry to recover from path sep error in type parsingFeb 10, 2025
fmease
fmease reviewed Feb 10, 2025
View reviewed changes
Comment threadcompiler/rustc_parse/src/parser/path.rs Outdated
@chenyukang
chenyukangforce-pushed the yukang-fix-arg-list-error-129273 branch 2 times, most recently from 8a9ba18 to 293514cCompareFebruary 10, 2025 11:30
@estebank

estebank commented Feb 10, 2025

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Feb 10, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 293514c has been approved by estebank

It is now in the queue for this repository.

@borsbors 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 Feb 10, 2025
@jhprattjhpratt mentioned this pull request Feb 11, 2025
Closed
@workingjubilee

workingjubilee commented Feb 11, 2025

Copy link
Copy Markdown
Member

Requires rebase
@bors r-

@borsbors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 11, 2025
@bors

bors commented Feb 11, 2025

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #127541) made this pull request unmergeable. Please resolve the merge conflicts.

@workingjubilee

workingjubilee commented Feb 11, 2025

Copy link
Copy Markdown
Member

thanks bors, very timely.

@chenyukang
chenyukangforce-pushed the yukang-fix-arg-list-error-129273 branch 2 times, most recently from 3d40966 to 88a41d6CompareFebruary 11, 2025 07:26
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 11, 2025
@bors
Auto merge ofrust-lang#136850- jhpratt:rollup-rm72dxb, r=jhpratt
bd68693
Rollup of 6 pull requests
Successful merges:
- rust-lang#134999 (Add cygwin target.)
- rust-lang#135677 (Small `rustc_resolve` cleanups)
- rust-lang#136699 (std: replace the `FromInner` implementation for addresses with private conversion functions)
- rust-lang#136758 (tests: `-Copt-level=3` instead of `-O` in assembly tests)
- rust-lang#136761 (tests: `-Copt-level=3` instead of `-O` in codegen tests)
- rust-lang#136833 (compiler: die immediately instead of handling unknown target codegen)
Failed merges:
- rust-lang#136808 (Try to recover from path sep error in type parsing)
r? `@ghost`
`@rustbot` modify labels: rollup
@estebank

estebank commented Feb 14, 2025

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Feb 14, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 88a41d6 has been approved by estebank

It is now in the queue for this repository.

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 14, 2025
@bors

bors commented Feb 14, 2025

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #137030) made this pull request unmergeable. Please resolve the merge conflicts.

@borsbors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 14, 2025
@borsbors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Feb 14, 2025
@chenyukang
chenyukangforce-pushed the yukang-fix-arg-list-error-129273 branch from 88a41d6 to 306ef08CompareFebruary 14, 2025 23:40
@chenyukang
chenyukangforce-pushed the yukang-fix-arg-list-error-129273 branch from 306ef08 to 0aa2e6bCompareFebruary 14, 2025 23:44
@chenyukang

chenyukang commented Feb 15, 2025

Copy link
Copy Markdown
MemberAuthor

@bors r=estebank

@bors

bors commented Feb 15, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 0aa2e6b has been approved by estebank

It is now in the queue for this repository.

@borsbors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 15, 2025
@matthiaskrgrmatthiaskrgr mentioned this pull request Feb 15, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 15, 2025
@bors
Auto merge ofrust-lang#137093- matthiaskrgr:rollup-72j7mut, r=matth…
d95a9e4
…iaskrgr
Rollup of 8 pull requests
Successful merges:
- rust-lang#127581 (Fix crate name validation)
- rust-lang#136490 (Do not allow attributes on struct field rest patterns)
- rust-lang#136808 (Try to recover from path sep error in type parsing)
- rust-lang#137055 (rustdoc: Properly restore search input placeholder)
- rust-lang#137068 (fix(rustdoc): Fixed `Copy Item Path` in rust doc)
- rust-lang#137070 (Do not generate invalid links in job summaries)
- rust-lang#137074 (compiletest: add `{ignore,only}-rustc_abi-x86-sse2` directives)
- rust-lang#137076 (triagebot.toml: ping me on changes to `tests/rustdoc-json`)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 16, 2025
@bors
Auto merge ofrust-lang#137093- matthiaskrgr:rollup-72j7mut, r=matth…
500a686
…iaskrgr
Rollup of 8 pull requests
Successful merges:
- rust-lang#127581 (Fix crate name validation)
- rust-lang#136490 (Do not allow attributes on struct field rest patterns)
- rust-lang#136808 (Try to recover from path sep error in type parsing)
- rust-lang#137055 (rustdoc: Properly restore search input placeholder)
- rust-lang#137068 (fix(rustdoc): Fixed `Copy Item Path` in rust doc)
- rust-lang#137070 (Do not generate invalid links in job summaries)
- rust-lang#137074 (compiletest: add `{ignore,only}-rustc_abi-x86-sse2` directives)
- rust-lang#137076 (triagebot.toml: ping me on changes to `tests/rustdoc-json`)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit f06b75d into rust-lang:masterFeb 16, 2025
@rustbotrustbot added this to the 1.86.0 milestone Feb 16, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 16, 2025
@rust-timer
Unrolled build forrust-lang#136808
665981f
Rollup merge of rust-lang#136808 - chenyukang:yukang-fix-arg-list-error-129273, r=estebank
Try to recover from path sep error in type parsing
Fixesrust-lang#129273
Error using `:` in the argument list may mess up the parser.
case `tests/ui/suggestions/struct-field-type-including-single-colon` also changed, seems it's the same meaning, should be OK.
r? `@estebank`
@cuvipercuviper modified the milestones: 1.86.0, 1.87.0Feb 16, 2025
This was referenced Apr 23, 2025
Closed
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 24, 2025
@matthiaskrgr
Rollup merge ofrust-lang#140228- fmease:revert-overzealous-colon-re…
3394121
…covery, r=jieyouxu
Revert overzealous parse recovery for single colons in paths
Basically manually reverts rust-lang#136808, cc `@chenyukang` `@estebank.`
Reopens rust-lang#129273.
Fixes [after beta backport] rust-lang#140227.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 24, 2025
@matthiaskrgr
Rollup merge ofrust-lang#140228- fmease:revert-overzealous-colon-re…
f45d2bd
…covery, r=jieyouxu
Revert overzealous parse recovery for single colons in paths
Basically manually reverts rust-lang#136808, cc ``@chenyukang`` ``@estebank.``
Reopens rust-lang#129273.
Fixes [after beta backport] rust-lang#140227.
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 24, 2025
@rust-timer
Unrolled build forrust-lang#140228
1eb1f7b
Rollup merge of rust-lang#140228 - fmease:revert-overzealous-colon-recovery, r=jieyouxu
Revert overzealous parse recovery for single colons in paths
Basically manually reverts rust-lang#136808, cc ``@chenyukang`` ``@estebank.``
Reopens rust-lang#129273.
Fixes [after beta backport] rust-lang#140227.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fmeasefmeasefmease left review comments

Assignees

@estebankestebank

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

E0050 emitted unexpectedly on missing :

7 participants

@chenyukang@estebank@bors@workingjubilee@fmease@cuviper@rustbot