Skip to content

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

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Feb 16, 2025

Conversation

chenyukang
Copy link
Member

@chenyukang chenyukang commented Feb 10, 2025

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

@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 Feb 10, 2025
@chenyukang chenyukang changed the title Try to recover from path sep error in parser Try to recover from path sep error in type parsing Feb 10, 2025
@chenyukang chenyukang force-pushed the yukang-fix-arg-list-error-129273 branch 2 times, most recently from 8a9ba18 to 293514c Compare February 10, 2025 11:30
@estebank
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 10, 2025

📌 Commit 293514c has been approved by estebank

It is now in the queue for this repository.

@bors 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 Feb 10, 2025
@workingjubilee
Copy link
Member

Requires rebase
@bors r-

@bors bors 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
Copy link
Collaborator

bors commented Feb 11, 2025

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

@workingjubilee
Copy link
Member

thanks bors, very timely.

@chenyukang chenyukang force-pushed the yukang-fix-arg-list-error-129273 branch 2 times, most recently from 3d40966 to 88a41d6 Compare February 11, 2025 07:26
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 11, 2025
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
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 14, 2025

📌 Commit 88a41d6 has been approved by estebank

It is now in the queue for this repository.

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

bors commented Feb 14, 2025

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

@bors bors 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
@bors bors 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 chenyukang force-pushed the yukang-fix-arg-list-error-129273 branch from 88a41d6 to 306ef08 Compare February 14, 2025 23:40
@chenyukang chenyukang force-pushed the yukang-fix-arg-list-error-129273 branch from 306ef08 to 0aa2e6b Compare February 14, 2025 23:44
@chenyukang
Copy link
Member Author

@bors r=estebank

@bors
Copy link
Collaborator

bors commented Feb 15, 2025

📌 Commit 0aa2e6b has been approved by estebank

It is now in the queue for this repository.

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 15, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 15, 2025
…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
…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:master Feb 16, 2025
6 checks passed
@rustbot rustbot 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
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

Fixes rust-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`
@cuviper cuviper modified the milestones: 1.86.0, 1.87.0 Feb 16, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 24, 2025
…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
…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
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.
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

E0050 emitted unexpectedly on missing :
7 participants