Try to recover from path sep error in type parsing #136808
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
chenyukang
changed the title
fmease
reviewed
Feb 10, 2025
chenyukang
force-pushed
the
yukang-fix-arg-list-error-129273
branch
2 times, most recently
from
8a9ba18 to
293514c
Compare
|
@bors r+ |
bors
added
S-waiting-on-bors
|
Requires rebase |
bors
added
S-waiting-on-author
|
☔ The latest upstream changes (presumably #127541) made this pull request unmergeable. Please resolve the merge conflicts. |
|
thanks bors, very timely. |
chenyukang
force-pushed
the
yukang-fix-arg-list-error-129273
branch
2 times, most recently
from
3d40966 to
88a41d6
Compare
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
|
@bors r+ |
bors
added
S-waiting-on-bors
|
☔ The latest upstream changes (presumably #137030) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
removed
the
S-waiting-on-bors
bors
added
the
S-waiting-on-author
chenyukang
force-pushed
the
yukang-fix-arg-list-error-129273
branch
from
88a41d6 to
306ef08
Compare
chenyukang
force-pushed
the
yukang-fix-arg-list-error-129273
branch
from
306ef08 to
0aa2e6b
Compare
|
@bors r=estebank |
bors
added
S-waiting-on-bors
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
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`
This was referenced Apr 23, 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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #129273
Error using
:in the argument list may mess up the parser.case
tests/ui/suggestions/struct-field-type-including-single-colonalso changed, seems it's the same meaning, should be OK.r? @estebank