Skip to content

[beta] Revert #117472: Stabilize C string literals - #119528

Merged
bors merged 3 commits into
rust-lang:betafrom
wesleywiser:revert_117472
Jan 10, 2024
Merged

[beta] Revert #117472: Stabilize C string literals#119528
bors merged 3 commits into
rust-lang:betafrom
wesleywiser:revert_117472

Conversation

@wesleywiser

@wesleywiserwesleywiser commented Jan 2, 2024•
edited
Loading

Copy link
Copy Markdown
Member

Based on discussion in #t-lang, revert the stabilization of C string literals in Rust 1.76.

I also reverted #118566 as it uses the newly stabilized C string literals in various places.

@rustbot

rustbot commented Jan 2, 2024

Copy link
Copy Markdown
Collaborator

r? @cjgillot

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

@rustbot

rustbot commented Jan 2, 2024

Copy link
Copy Markdown
Collaborator

⚠️Warning⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rustbotrustbot added O-unix Operating system: Unix-like O-windows Operating system: Windows 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jan 2, 2024
@rustbot

rustbot commented Jan 2, 2024

Copy link
Copy Markdown
Collaborator

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@wesleywiserwesleywiser changed the title Revert #117472: Stabilize C string literals[beta] Revert #117472: Stabilize C string literalsJan 2, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbotrustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jan 2, 2024
@rustbot

This comment was marked as outdated.

Sign in to view
@Noratrieb

Noratrieb commented Jan 2, 2024

Copy link
Copy Markdown
Member

Why revert #118566? Seems like a complex diff for no reason, just use a few #![cfg_attr(not(bootstrap), feature(c_str_literal))]

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@wesleywiser

wesleywiser commented Jan 2, 2024

Copy link
Copy Markdown
MemberAuthor

Why revert #118566? Seems like a complex diff for no reason, just use a few #![cfg_attr(not(bootstrap), feature(c_str_literal))]

Yeah, that's fair. The reverts were clean/trivial so that seemed slightly preferable to me but it's only a few lines to fix the feature gates.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@nnethercote

nnethercote commented Jan 7, 2024

Copy link
Copy Markdown
Contributor

The reverts were clean/trivial so that seemed slightly preferable to me but it's only a few lines to fix the feature gates.

@wesleywiser Will you go forward with that alternative approach? I don't mind which way the revert happens, but this is somewhat time-sensitive so I don't want it to sit without progress for long.

This was referenced Jan 8, 2024
Closed
Merged
@GoldsteinEGoldsteinE mentioned this pull request Jan 8, 2024
Closed
12 tasks
@novafacingnovafacing mentioned this pull request Jan 8, 2024
Merged
ehuss added a commit to rust-lang/reference that referenced this pull request Jan 9, 2024
@ehuss
Revert#1423: Document C string literal tokens.
752d365
This reverts commit 21a27e1, reversing
changes made to 01a12f2.
This is being reverted in rust-lang/rust#119528
ehuss added a commit to rust-lang/edition-guide that referenced this pull request Jan 9, 2024
@ehuss
Revert#286: Add C-string literals.
db88204
This reverts commit 5a4e7ba, reversing
changes made to 34fca48.
This is being reverted in rust-lang/rust#119528
@wesleywiserwesleywiser added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 9, 2024
@borsbors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 10, 2024
@rust-log-analyzer

rust-log-analyzer commented Jan 10, 2024

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)

@NeptuneUltra101

This comment was marked as spam.

Sign in to view
@ehuss

ehuss commented Jan 10, 2024

Copy link
Copy Markdown
Contributor

@bors retry

timeout on dist-apple-various

@borsbors 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 Jan 10, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 10, 2024
@bors
Auto merge ofrust-lang#119528- wesleywiser:revert_117472, r=nnether…
c4cf95c
…cote
[beta] Revert rust-lang#117472: Stabilize C string literals
Based on discussion in [#t-lang](https://rust-lang.zulipchat.com/#narrow/stream/213817-t-lang/topic/rfc.203349.3A.20mixed.20utf8.20literals), revert the stabilization of C string literals in Rust 1.76.
I also reverted rust-lang#118566 as it uses the newly stabilized C string literals in various places.
@bors

bors commented Jan 10, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b2d48ca with merge c4cf95c...

@bors

bors commented Jan 10, 2024

Copy link
Copy Markdown
Collaborator

💥 Test timed out

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 10, 2024
@ehuss

ehuss commented Jan 10, 2024

Copy link
Copy Markdown
Contributor

@bors retry

timeout on two apple runners

@borsbors 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 Jan 10, 2024
@rust-log-analyzer

rust-log-analyzer commented Jan 10, 2024

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors

bors commented Jan 10, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit b2d48ca with merge 3a3478e...

@bors

bors commented Jan 10, 2024

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: nnethercote
Pushing 3a3478e to beta...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jan 10, 2024
@bors
bors merged commit 3a3478e into rust-lang:betaJan 10, 2024
@rustbotrustbot added this to the 1.76.0 milestone Jan 10, 2024
@cuviper

cuviper commented Jan 11, 2024

Copy link
Copy Markdown
Member

Since this already merged on beta, and was approved afterward, I think the "backport" is done.

@rustbot label -beta-nominated +beta-accepted

@rustbotrustbot added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Jan 11, 2024
@eduardosmeduardosm mentioned this pull request Jan 11, 2024
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 12, 2024
@matthiaskrgr
Rollup merge ofrust-lang#119865- eduardosm:bump-version-c_str_liter…
c738e54
…als, r=Nilstrieb
Set `c_str_literals` stabilization version back to `CURRENT_RUSTC_VERSION`
`c_str_literals`'s stabilization has been delayed to 1.77 (rust-lang#119528).
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 12, 2024
@rust-timer
Unrolled build forrust-lang#119865
70be560
Rollup merge of rust-lang#119865 - eduardosm:bump-version-c_str_literals, r=Nilstrieb
Set `c_str_literals` stabilization version back to `CURRENT_RUSTC_VERSION`
`c_str_literals`'s stabilization has been delayed to 1.77 (rust-lang#119528).
@ehussehuss mentioned this pull request Jan 18, 2024
Merged
@ehussehuss mentioned this pull request Feb 9, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 12, 2024
@bors
Auto merge ofrust-lang#120821- ehuss:fix-c-str-lit-bootstrap, r=Mar…
3d66104
…k-Simulacrum
[Beta 1.77] Fix bootstrapping from 1.76
Due to the timing of the revert for stabilization of c_str_literal (rust-lang#119528 which reverted in 1.76) and trait_upcasting (rust-lang#120269 which reverted in 1.76), which happened after rust-lang#119211 (Bump stage0 to 1.76 beta), this resulted in some of the feature attributes not being restored which are needed to be able to bootstrap from 1.76. This restores those features.
This also includes a stage0 bump to the just released stable. This is necessary because stage0 was currently pointing at an old beta which did not contain the reverts.
Fixesrust-lang#120810
cameraMeasurementTech added a commit to cameraMeasurementTech/rust-lang that referenced this pull request Dec 11, 2024
@cameraMeasurementTech
Revert #1423: Document C string literal tokens.
b1c4264
This reverts commit 21a27e16892fbdbec0c043c8c521b06e9174f6fd, reversing
changes made to 01a12f22be9ff91edba38ebe982520cf19b86931.
This is being reverted in rust-lang/rust#119528
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@cjgillotcjgillot

Labels

A-testsuiteArea: The testsuite used to check the correctness of rustcbeta-acceptedAccepted for backporting to the compiler in the beta channel.merged-by-borsThis PR was explicitly merged by bors.O-unixOperating system: Unix-likeO-windowsOperating system: WindowsS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.76.0

Development

Successfully merging this pull request may close these issues.

11 participants

@wesleywiser@rustbot@rust-log-analyzer@Noratrieb@nnethercote@bors@matthiaskrgr@NeptuneUltra101@ehuss@cuviper@cjgillot