Skip to content

Conversation

compiler-errors
Copy link
Member

Fixes #133479
cc #132341

I think this fixes a purely theoretical regression since it only affects edition 2015 (who is using that?) and only in the very rare case of a raw lifetime followed immediately by a lifetime like 'r#a'r.

@rustbot
Copy link
Collaborator

rustbot commented Nov 26, 2024

r? @BoxyUwU

rustbot has assigned @BoxyUwU.
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 Nov 26, 2024
@mattheww
Copy link
Contributor

For what it's worth, I've run my testsuite against this PR and it isn't finding any more problems.

@bors
Copy link
Collaborator

bors commented Nov 27, 2024

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

Copy link
Contributor

@estebank estebank left a comment

Choose a reason for hiding this comment

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

r=me after rebase

@BoxyUwU
Copy link
Member

BoxyUwU commented Nov 29, 2024

r? @estebank

@rustbot rustbot assigned estebank and unassigned BoxyUwU Nov 29, 2024
@compiler-errors
Copy link
Member Author

@bors r=estebank

@bors
Copy link
Collaborator

bors commented Dec 1, 2024

📌 Commit d878fd8 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 Dec 1, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 1, 2024
…ebank

Only error raw lifetime followed by `\'` in edition 2021+

Fixes rust-lang#133479
cc rust-lang#132341

I think this fixes a purely theoretical regression since it only affects edition 2015 (who is using that?) and only in the very rare case of a raw lifetime followed immediately by a lifetime like `'r#a'r`.
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 1, 2024
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#128004 (codegen `#[naked]` functions using global asm)
 - rust-lang#132974 (Properly pass linker arguments that contain commas)
 - rust-lang#133403 (Make `adjust_fulfillment_errors` work with `HostEffectPredicate` and `const_conditions`)
 - rust-lang#133482 (Only error raw lifetime followed by `\'` in edition 2021+)
 - rust-lang#133595 (Do not emit `missing_doc_code_examples` rustdoc lint on module and a few other items)
 - rust-lang#133669 (Move some functions out of const_swap feature gate)
 - rust-lang#133674 (Fix chaining `carrying_add`s)
 - rust-lang#133691 (Check let source before suggesting annotation)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 1, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#132974 (Properly pass linker arguments that contain commas)
 - rust-lang#133403 (Make `adjust_fulfillment_errors` work with `HostEffectPredicate` and `const_conditions`)
 - rust-lang#133482 (Only error raw lifetime followed by `\'` in edition 2021+)
 - rust-lang#133595 (Do not emit `missing_doc_code_examples` rustdoc lint on module and a few other items)
 - rust-lang#133669 (Move some functions out of const_swap feature gate)
 - rust-lang#133674 (Fix chaining `carrying_add`s)
 - rust-lang#133691 (Check let source before suggesting annotation)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 1, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#132974 (Properly pass linker arguments that contain commas)
 - rust-lang#133403 (Make `adjust_fulfillment_errors` work with `HostEffectPredicate` and `const_conditions`)
 - rust-lang#133482 (Only error raw lifetime followed by `\'` in edition 2021+)
 - rust-lang#133595 (Do not emit `missing_doc_code_examples` rustdoc lint on module and a few other items)
 - rust-lang#133669 (Move some functions out of const_swap feature gate)
 - rust-lang#133674 (Fix chaining `carrying_add`s)
 - rust-lang#133691 (Check let source before suggesting annotation)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 337c48c into rust-lang:master Dec 1, 2024
6 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 1, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 1, 2024
Rollup merge of rust-lang#133482 - compiler-errors:raw-lt-tick, r=estebank

Only error raw lifetime followed by `\'` in edition 2021+

Fixes rust-lang#133479
cc rust-lang#132341

I think this fixes a purely theoretical regression since it only affects edition 2015 (who is using that?) and only in the very rare case of a raw lifetime followed immediately by a lifetime like `'r#a'r`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.

rustc 1.83 lexing regression in the 2015 edition: 'r#x'y
7 participants