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.

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

use c literals in compiler and library #111647

Merged
merged 3 commits into from
Jun 2, 2023
Merged

use c literals in compiler and library #111647

merged 3 commits into from
Jun 2, 2023

Conversation

klensy
Copy link
Contributor

@klensy klensy commented May 16, 2023 •
edited
Loading

Use c literals #108801 in compiler and library

currently blocked on:

  • rustfmt: don't know how to format c literals nope, nightly one works.
  • bootstrap

r? @ghost
@rustbot blocked

@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. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels May 16, 2023
@rustbot
Copy link
Collaborator

rustbot commented May 16, 2023

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

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 the S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. label May 16, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented May 23, 2023

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

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot rustbot 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 May 31, 2023
@klensy
Copy link
Contributor Author

klensy commented May 31, 2023

@rustbot label: -S-blocked
r?

@rustbot rustbot removed the S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. label May 31, 2023
@rustbot
Copy link
Collaborator

rustbot commented May 31, 2023

Error: Parsing assign command in comment failed: ...'' | error: specify user to assign to at >| ''...

Please file an issue on GitHub at triagebot if there's a problem with this bot, or reach out on #t-infra on Zulip.

@klensy
Copy link
Contributor Author

klensy commented May 31, 2023

r? compiler

@oli-obk
Copy link
Contributor

oli-obk commented Jun 1, 2023

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 1, 2023

📌 Commit f212ba6 has been approved by oli-obk

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 Jun 1, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 1, 2023
@matthiaskrgr
Rollup merge of rust-lang#111647 - klensy:cstr, r=oli-obk
78c4aaa 
use c literals in compiler and library

Use c literals rust-lang#108801 in compiler and library

currently blocked on:
* <strike>rustfmt: don't know how to format c literals</strike> nope, nightly one works.
* <strike>bootstrap</strike>

r? `@ghost`
`@rustbot` blocked
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 1, 2023
Closed
@matthiaskrgr
Copy link
Member

@bors r- #112181 (comment)

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 1, 2023
@oli-obk
Copy link
Contributor

oli-obk commented Jun 2, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Jun 2, 2023

📌 Commit 2f459f7 has been approved by oli-obk

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 2, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 2, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2023
@bors
Auto merge of rust-lang#112212 - matthiaskrgr:rollup-e5ilgf0, r=matth…
794249d 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#111647 (use c literals in compiler and library)
 - rust-lang#112165 (Rename `impl_defaultness` to `defaultness`)
 - rust-lang#112182 (CFI: Fix cfi with repr(transparent): transform_ty: unexpected Alias(Proj)
 - rust-lang#112189 (Debug-assert that closures and generators are made with the right number of substitutions)
 - rust-lang#112205 (Add rustdoc test for double-hyphen to dash doc comment conversion)
 - rust-lang#112206 (Fix typo in `std::cell` module docs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a3b639c into rust-lang:master Jun 2, 2023
11 checks passed
@rustbot rustbot added this to the 1.72.0 milestone Jun 2, 2023
@fmease fmease mentioned this pull request Jul 4, 2023
Merged
fee1-dead added a commit to fee1-dead-contrib/rust that referenced this pull request Jul 6, 2023
@fee1-dead
Rollup merge of rust-lang#113334 - fmease:revert-lexing-c-str-lits, r…
1830b80 
…=compiler-errors

Revert the lexing of `c"…"` string literals

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

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

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

`@rustbot` label F-c_str_literals beta-nominated
@klensy klensy mentioned this pull request Dec 3, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 14, 2023
@bors
Auto merge of rust-lang#118566 - klensy:cstr-new, r=WaffleLapkin
1aa6aef 
use c literals in compiler and library

Relands refreshed rust-lang#111647
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Dec 15, 2023
@bors
Auto merge of #118566 - klensy:cstr-new, r=WaffleLapkin
36d6041 
use c literals in compiler and library

Relands refreshed rust-lang/rust#111647
lnicola pushed a commit to lnicola/rust-analyzer that referenced this pull request Apr 7, 2024
@bors
Auto merge of #118566 - klensy:cstr-new, r=WaffleLapkin
a266b71 
use c literals in compiler and library

Relands refreshed rust-lang/rust#111647
RalfJung pushed a commit to RalfJung/rust-analyzer that referenced this pull request Apr 27, 2024
@bors
Auto merge of #118566 - klensy:cstr-new, r=WaffleLapkin
0681f29 
use c literals in compiler and library

Relands refreshed rust-lang/rust#111647
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fmease fmease fmease left review comments

Assignees

@oli-obk oli-obk

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.72.0
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@klensy @rustbot @rust-log-analyzer @bors @oli-obk @matthiaskrgr @fmease