Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Revert "Don't recover lifetimes/labels containing emojis as character literals" #110135

Merged
merged 1 commit into from
Apr 13, 2023

Conversation

compiler-errors
Copy link
Member

Reverts PR #108031 per #109754 (comment)

Fixes (doesnt close until beta backported) #109746

This reverts commit e3f9db5.
This reverts commit 98b82ae.
This reverts commit 380fa26.

… literals"

Reverts PR rust-lang#108031
Fixes (doesnt close until beta backported) rust-lang#109746

This reverts commit e3f9db5.
This reverts commit 98b82ae.
This reverts commit 380fa26.
@rustbot
Copy link
Collaborator

rustbot commented Apr 10, 2023

r? @davidtwco

(rustbot has picked a reviewer for you, use r? to override)

@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 10, 2023
@compiler-errors compiler-errors added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 10, 2023
Copy link
Member

@davidtwco davidtwco 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

@compiler-errors
Copy link
Member Author

@bors r=davidtwco

@bors
Copy link
Contributor

bors commented Apr 10, 2023

📌 Commit a047064 has been approved by davidtwco

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 Apr 10, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Apr 10, 2023
…avidtwco

Revert "Don't recover lifetimes/labels containing emojis as character literals"

Reverts PR rust-lang#108031 per rust-lang#109754 (comment)

Fixes (doesnt close until beta backported) rust-lang#109746

This reverts commit e3f9db5.
This reverts commit 98b82ae.
This reverts commit 380fa26.
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Apr 11, 2023
…avidtwco

Revert "Don't recover lifetimes/labels containing emojis as character literals"

Reverts PR rust-lang#108031 per rust-lang#109754 (comment)

Fixes (doesnt close until beta backported) rust-lang#109746

This reverts commit e3f9db5.
This reverts commit 98b82ae.
This reverts commit 380fa26.
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Apr 11, 2023
…avidtwco

Revert "Don't recover lifetimes/labels containing emojis as character literals"

Reverts PR rust-lang#108031 per rust-lang#109754 (comment)

Fixes (doesnt close until beta backported) rust-lang#109746

This reverts commit e3f9db5.
This reverts commit 98b82ae.
This reverts commit 380fa26.
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Apr 11, 2023
…avidtwco

Revert "Don't recover lifetimes/labels containing emojis as character literals"

Reverts PR rust-lang#108031 per rust-lang#109754 (comment)

Fixes (doesnt close until beta backported) rust-lang#109746

This reverts commit e3f9db5.
This reverts commit 98b82ae.
This reverts commit 380fa26.
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 12, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#109810 (Replace rustdoc-ui/{c,z}-help tests with a stable run-make test )
 - rust-lang#110035 (fix: ensure bad `#[test]` invocs retain correct AST)
 - rust-lang#110089 (sync::mpsc: synchronize receiver disconnect with initialization)
 - rust-lang#110103 (Report overflows gracefully with new solver)
 - rust-lang#110122 (Fix x check --stage 1 when download-ci-llvm=false)
 - rust-lang#110133 (Do not use ImplDerivedObligationCause for inherent impl method error reporting)
 - rust-lang#110135 (Revert "Don't recover lifetimes/labels containing emojis as character literals")
 - rust-lang#110235 (Fix `--extend-css` option)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 57393be into rust-lang:master Apr 13, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 13, 2023
@apiraino
Copy link
Contributor

Beta backport accepted as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 13, 2023
@pietroalbini pietroalbini removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 16, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 16, 2023
…troalbini

[stable] Prepare Rust 1.69.0

Last minute backports:

*  rust-lang#109643
* rust-lang#110135
* rust-lang#109938
* rust-lang#109937
* rust-lang#109266

This PR also bumps the channel to stable, and backports the release notes from master.

r? `@ghost`
cc `@rust-lang/release`
@compiler-errors compiler-errors deleted the revert-108031 branch August 11, 2023 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

6 participants