Skip to content

Revert overzealous parse recovery for single colons in paths#140228

Merged
bors merged 1 commit intorust-lang:masterfrom
fmease:revert-overzealous-colon-recovery
Apr 24, 2025
Merged

Revert overzealous parse recovery for single colons in paths#140228
bors merged 1 commit intorust-lang:masterfrom
fmease:revert-overzealous-colon-recovery

Conversation

@fmease
Copy link
Member

@fmease fmease commented Apr 24, 2025

Basically manually reverts #136808, cc @chenyukang @estebank.

Reopens #129273.
Fixes [after beta backport] #140227.

@fmease fmease added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 24, 2025
@rustbot
Copy link
Collaborator

rustbot commented Apr 24, 2025

r? @SparrowLii

rustbot has assigned @SparrowLii.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 Apr 24, 2025
@fmease fmease changed the title Revert overzealous parse recovery for single colons Revert overzealous parse recovery for single colons in paths Apr 24, 2025
@fmease fmease force-pushed the revert-overzealous-colon-recovery branch from fe16528 to 16da97b Compare April 24, 2025 00:57
jieyouxu
jieyouxu approved these changes Apr 24, 2025
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

The (manual) revert looks right to me when compared to #136808, the regression test also looks good. Thanks!

@jieyouxu
Copy link
Member

jieyouxu commented Apr 24, 2025

r? jieyouxu @bors r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 24, 2025

📌 Commit 16da97b has been approved by jieyouxu

It is now in the queue for this repository.

@rustbot rustbot assigned jieyouxu and unassigned SparrowLii Apr 24, 2025
@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 Apr 24, 2025
@jieyouxu jieyouxu mentioned this pull request Apr 24, 2025
Open
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 24, 2025
@matthiaskrgr
Rollup merge of rust-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.
This was referenced Apr 24, 2025
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 24, 2025
@bors
Auto merge of rust-lang#140245 - matthiaskrgr:rollup-e0fwsfv, r=matth…
3c877f6 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#139261 (mitigate MSVC alignment issue on x86-32)
 - rust-lang#140075 (Mention average in midpoint documentations)
 - rust-lang#140184 (Update doc of cygwin target)
 - rust-lang#140186 (Rename `compute_x` methods)
 - rust-lang#140194 (minicore: Have `//@ add-core-stubs` also imply `-Cforce-unwind-tables=yes`)
 - rust-lang#140195 (triagebot: label minicore changes w/ `A-test-infra-minicore` and ping jieyouxu on changes)
 - rust-lang#140214 (Remove comment about handling non-global where bounds with corresponding projection)
 - rust-lang#140228 (Revert overzealous parse recovery for single colons in paths)

r? `@ghost`
`@rustbot` modify labels: rollup
@jieyouxu
Copy link
Member

jieyouxu commented Apr 24, 2025

This was discussed in today's compiler triage meeting. Beta backport was approved. Thanks!

@rustbot label: +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 24, 2025
@bors bors merged commit f45d2bd into rust-lang:master Apr 24, 2025
6 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 24, 2025
@rust-timer
Unrolled build for rust-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.
@rustbot rustbot added this to the 1.88.0 milestone Apr 24, 2025
@fmease fmease deleted the revert-overzealous-colon-recovery branch April 24, 2025 15:20
cuviper added a commit to cuviper/rust that referenced this pull request Apr 24, 2025
@cuviper
Bless ui/associated-consts/issue-93835
7ef0050 
Beta-backporting rust-lang#140228 has the same effect on this test as rust-lang#139341
already had on master.
@cuviper cuviper mentioned this pull request Apr 24, 2025
Merged
@cuviper cuviper removed this from the 1.88.0 milestone Apr 24, 2025
@cuviper cuviper added this to the 1.87.0 milestone Apr 24, 2025
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 24, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 26, 2025
@bors
Auto merge of rust-lang#140269 - cuviper:beta-next, r=cuviper
64a00f5 
[beta] backports

- Do not mix normalized and unnormalized caller bounds when constructing param-env for `receiver_is_dispatchable` rust-lang#138941
- Ignore zero-sized types in wasm future-compat warning rust-lang#139498
- Don't warn about `v128` in wasm ABI transition rust-lang#139809
- Revert overzealous parse recovery for single colons in paths rust-lang#140228

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 26, 2025
@bors
Auto merge of rust-lang#140269 - cuviper:beta-next, r=cuviper
00f7d2c 
[beta] backports

- Do not mix normalized and unnormalized caller bounds when constructing param-env for `receiver_is_dispatchable` rust-lang#138941
- Ignore zero-sized types in wasm future-compat warning rust-lang#139498
- Don't warn about `v128` in wasm ABI transition rust-lang#139809
- Revert overzealous parse recovery for single colons in paths rust-lang#140228

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 26, 2025
@bors
Auto merge of rust-lang#140269 - cuviper:beta-next, r=cuviper
e30daf3 
[beta] backports

- Do not mix normalized and unnormalized caller bounds when constructing param-env for `receiver_is_dispatchable` rust-lang#138941
- Ignore zero-sized types in wasm future-compat warning rust-lang#139498
- Don't warn about `v128` in wasm ABI transition rust-lang#139809
- Revert overzealous parse recovery for single colons in paths rust-lang#140228

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 26, 2025
@bors
Auto merge of rust-lang#140269 - cuviper:beta-next, r=cuviper
74f40c4 
[beta] backports

- Do not mix normalized and unnormalized caller bounds when constructing param-env for `receiver_is_dispatchable` rust-lang#138941
- Ignore zero-sized types in wasm future-compat warning rust-lang#139498
- Don't warn about `v128` in wasm ABI transition rust-lang#139809
- Revert overzealous parse recovery for single colons in paths rust-lang#140228

r? cuviper
@fmease fmease mentioned this pull request Apr 28, 2025
Closed
github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request May 9, 2025
@bors
Auto merge of rust-lang#140245 - matthiaskrgr:rollup-e0fwsfv, r=matth…
f6cec8b 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#139261 (mitigate MSVC alignment issue on x86-32)
 - rust-lang#140075 (Mention average in midpoint documentations)
 - rust-lang#140184 (Update doc of cygwin target)
 - rust-lang#140186 (Rename `compute_x` methods)
 - rust-lang#140194 (minicore: Have `//@ add-core-stubs` also imply `-Cforce-unwind-tables=yes`)
 - rust-lang#140195 (triagebot: label minicore changes w/ `A-test-infra-minicore` and ping jieyouxu on changes)
 - rust-lang#140214 (Remove comment about handling non-global where bounds with corresponding projection)
 - rust-lang#140228 (Revert overzealous parse recovery for single colons in paths)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@chenyukang chenyukang chenyukang approved these changes

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels

beta-accepted Accepted for backporting to the compiler in the beta channel. 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

Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

7 participants

@fmease @rustbot @jieyouxu @bors @chenyukang @cuviper @SparrowLii