Skip to content

Revert the lexing of c"…" string literals #113334

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.

Sign up for GitHub

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

Jump to bottom
Merged
bors merged 5 commits into from
Jul 6, 2023
Merged

Revert the lexing of c"…" string literals #113334

bors merged 5 commits into from
Jul 6, 2023

Conversation

@fmease
Copy link
Member

@fmease fmease commented Jul 4, 2023 •
edited
Loading

Fixes [after beta-backport] #113235.
Further progress is tracked in #113333.

This PR manually reverts parts of #108801 (since a git-revert would've been too coarse-grained & messy)
and git-reverts #111647.

CC @fee1-dead (#108801) @klensy (#111647)
r? @compiler-errors

@rustbot label F-c_str_literals beta-nominated

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jul 4, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jul 4, 2023

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@rustbot rustbot added beta-nominated Nominated for backporting to the compiler in the beta channel. F-c_str_literals `#![feature(c_str_literals)]` labels Jul 4, 2023
@fmease fmease mentioned this pull request Jul 4, 2023
Closed
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@fmease

This comment was marked as outdated.

Sign in to view
fmease
fmease commented Jul 4, 2023
View reviewed changes
@fmease fmease force-pushed the revert-lexing-c-str-lits branch from 306679b to 8460f6a Compare July 4, 2023 19:52
@fmease fmease marked this pull request as draft July 5, 2023 10:13
@fmease fmease force-pushed the revert-lexing-c-str-lits branch from 8460f6a to 1ed0736 Compare July 5, 2023 11:15
@fmease fmease marked this pull request as ready for review July 5, 2023 11:16
@fmease fmease force-pushed the revert-lexing-c-str-lits branch from 1ed0736 to cfeabbf Compare July 5, 2023 11:19
@fmease fmease force-pushed the revert-lexing-c-str-lits branch from cfeabbf to 22fd6a6 Compare July 5, 2023 11:45
@m-ou-se m-ou-se removed the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Jul 5, 2023
@compiler-errors
Copy link
Member

compiler-errors commented Jul 5, 2023

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 5, 2023

📌 Commit 22fd6a6 has been approved by compiler-errors

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 Jul 5, 2023
@fee1-dead fee1-dead mentioned this pull request Jul 6, 2023
Merged
@bors bors merged commit 1830b80 into rust-lang:master Jul 6, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jul 6, 2023
@apiraino
Copy link
Contributor

apiraino commented Jul 6, 2023

Beta backport approved 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 Jul 6, 2023
@dtolnay dtolnay mentioned this pull request Jul 7, 2023
Closed
12 tasks
@Alexendoo Alexendoo mentioned this pull request Jul 7, 2023
Merged
@fee1-dead fee1-dead mentioned this pull request Jul 8, 2023
Merged
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 8, 2023
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.72.0, 1.71.0 Jul 8, 2023
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jul 8, 2023
Merged
@fmease fmease deleted the revert-lexing-c-str-lits branch July 8, 2023 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@compiler-errors compiler-errors

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc beta-accepted Accepted for backporting to the compiler in the beta channel. F-c_str_literals `#![feature(c_str_literals)]` S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.71.0

Development

Successfully merging this pull request may close these issues.

8 participants

@fmease @rustbot @rust-log-analyzer @compiler-errors @bors @apiraino @m-ou-se @Mark-Simulacrum