Add CStr::bytes iterator #104353

clarfonthey · 2022-11-13T09:16:24Z

Since rust-lang/libs-team#134 was also accepted, this type is now core::ffi::c_str::Bytes instead of core::ffi::CStrBytes.

rustbot · 2022-11-13T09:16:31Z

r? @thomcc

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

rustbot · 2022-11-13T09:16:33Z

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

thomcc · 2022-11-13T19:11:02Z

This seems fairly reasonable to me. Can you file an ACP though?

clarfonthey · 2022-11-15T14:10:22Z

Sounds reasonable to me! Filed those and replaced the description with a link back to the ACP.

clarfonthey · 2023-05-30T19:56:12Z

Since the ACP was accepted, I removed the as_c_str and AsRef impl and opened a tracking issue. Adding the removed bits was mentioned as an unanswered question in the tracking issue since it was not accepted as part of the ACP.

clarfonthey · 2023-05-30T20:27:11Z

@rustbot ready

(not sure if I can just do this, or if someone else will have to)

(edit: looks like I can, but it doesn't remove the S-waiting-on-ACP tag. someone else will have to do that)

clarfonthey · 2023-05-31T11:16:37Z

@rustbot blocked

Going to open a PR in light of this ACP being accepted: rust-lang/libs-team#134

Then just make this depend on that one being merged first.

bors · 2023-09-20T02:26:22Z

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

thomcc · 2024-02-01T22:54:46Z

I'm going to be away for a few months, so I'm rerolling my PRs so that folks don't have to wait for me. Sorry/thanks.

r? libs

joshtriplett · 2024-02-11T02:51:01Z

r? libs

clarfonthey · 2024-03-11T22:35:03Z

Oh, I'm terrible with batching review comments, so, I get that. Will poke around the code in a bit to see what I can do.

clarfonthey · 2024-03-12T21:23:57Z

library/core/src/ffi/c_str.rs

+    /// We could eventually expose this publicly, if we wanted.
+    #[inline]
+    #[must_use]
+    const fn as_non_null_ptr(&self) -> NonNull<c_char> {
+        NonNull::from(&self.inner).as_non_null_ptr()
+    }
+


Decided to put this because it seems like something we'd probably add in the future, but I don't really feel like doing an ACP for this right now. It felt reasonable enough to factor into its own method, at least.

I thought about why as_ptr uses addr_of! instead of a safe version (since, well, we require a reference to &self to make this work, and thus any potential UB arguments don't make sense) and concluded that we don't need to here, but if I'm wrong about that, please let me know!

I'm not sure what you're referring to -- CStr::as_ptr() just calls the slice as_ptr(), which is just a couple pointer casts. I only found addr_of! used in Rc/Arc::as_ptr, and those are digging into a further heap allocation.

Oh, sorry, I totally mixed up the implementations for as_ptr and to_bytes_with_nul. The latter uses addr_of to convert the slice into *const [u8] instead of the existing method, but that's going to be unsafe anyway, so, it's fair.

Huh, I don't see any reason it's needed there either, just a little bit shorter than it was with double pointer casts before addr_of!. No matter.

cuviper · 2024-03-13T04:20:05Z

@bors r+ rollup

bors · 2024-03-13T04:20:08Z

📌 Commit a38a556 has been approved by cuviper

It is now in the queue for this repository.

…iper Add CStr::bytes iterator See rust-lang/libs-team#135 for an ACP. Since rust-lang/libs-team#134 was also accepted, this type is now `core::ffi::c_str::Bytes` instead of `core::ffi::CStrBytes`.

…iaskrgr Rollup of 12 pull requests Successful merges: - rust-lang#104353 (Add CStr::bytes iterator) - rust-lang#120699 (Document `TRACK_DIAGNOSTIC` calls.) - rust-lang#121207 (Add `-Z external-clangrt`) - rust-lang#122397 (Various cleanups around the const eval query providers) - rust-lang#122416 (Various style improvements to `rustc_lint::levels`) - rust-lang#122422 (compiletest: Allow `only-unix` in test headers) - rust-lang#122424 (fix: typos) - rust-lang#122425 (Increase timeout for new bors bot) - rust-lang#122426 (Fix StableMIR `WrappingRange::is_full` computation) - rust-lang#122430 (Generate link to `Local` in `hir::Let` documentation) - rust-lang#122434 (pattern analysis: rename a few types) - rust-lang#122437 (pattern analysis: remove `MaybeInfiniteInt::JustAfterMax`) r? `@ghost` `@rustbot` modify labels: rollup

…iper Add CStr::bytes iterator See rust-lang/libs-team#135 for an ACP. Since rust-lang/libs-team#134 was also accepted, this type is now `core::ffi::c_str::Bytes` instead of `core::ffi::CStrBytes`.

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#104353 (Add CStr::bytes iterator) - rust-lang#120699 (Document `TRACK_DIAGNOSTIC` calls.) - rust-lang#120943 (Create some minimal HIR for associated opaque types) - rust-lang#121764 (Make incremental sessions identity no longer depend on the crate names provided by source code) - rust-lang#122375 (CFI: Break tests into smaller files) - rust-lang#122397 (Various cleanups around the const eval query providers) - rust-lang#122405 (Add methods to create StableMIR constant) - rust-lang#122416 (Various style improvements to `rustc_lint::levels`) - rust-lang#122440 (const-eval: organize and extend tests for required-consts) r? `@ghost` `@rustbot` modify labels: rollup

…iper Add CStr::bytes iterator See rust-lang/libs-team#135 for an ACP. Since rust-lang/libs-team#134 was also accepted, this type is now `core::ffi::c_str::Bytes` instead of `core::ffi::CStrBytes`.

…iaskrgr Rollup of 11 pull requests Successful merges: - rust-lang#104353 (Add CStr::bytes iterator) - rust-lang#114038 (unix time module now return result) - rust-lang#119676 (rustdoc-search: search types by higher-order functions) - rust-lang#120699 (Document `TRACK_DIAGNOSTIC` calls.) - rust-lang#121899 (Document how removing a type's field can be bad and what to do instead) - rust-lang#121940 (Mention Register Size in `#[warn(asm_sub_register)]`) - rust-lang#122397 (Various cleanups around the const eval query providers) - rust-lang#122405 (Add methods to create StableMIR constant) - rust-lang#122416 (Various style improvements to `rustc_lint::levels`) - rust-lang#122440 (const-eval: organize and extend tests for required-consts) - rust-lang#122461 (fix unsoundness in Step::forward_unchecked for signed integers) r? `@ghost` `@rustbot` modify labels: rollup

…iper Add CStr::bytes iterator See rust-lang/libs-team#135 for an ACP. Since rust-lang/libs-team#134 was also accepted, this type is now `core::ffi::c_str::Bytes` instead of `core::ffi::CStrBytes`.

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#104353 (Add CStr::bytes iterator) - rust-lang#119676 (rustdoc-search: search types by higher-order functions) - rust-lang#120699 (Document `TRACK_DIAGNOSTIC` calls.) - rust-lang#121899 (Document how removing a type's field can be bad and what to do instead) - rust-lang#122405 (Add methods to create StableMIR constant) - rust-lang#122416 (Various style improvements to `rustc_lint::levels`) - rust-lang#122421 (Improve `Step` docs) - rust-lang#122440 (const-eval: organize and extend tests for required-consts) - rust-lang#122461 (fix unsoundness in Step::forward_unchecked for signed integers) Failed merges: - rust-lang#122397 (Various cleanups around the const eval query providers) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#104353 - clarfonthey:cstr-bytes-iter, r=cuviper Add CStr::bytes iterator See rust-lang/libs-team#135 for an ACP. Since rust-lang/libs-team#134 was also accepted, this type is now `core::ffi::c_str::Bytes` instead of `core::ffi::CStrBytes`.

rustbot assigned thomcc Nov 13, 2022

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 13, 2022

rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Nov 13, 2022

This comment has been minimized.

Sign in to view

clarfonthey force-pushed the cstr-bytes-iter branch from 9759aad to b3c41f3 Compare November 13, 2022 09:39

thomcc added the S-waiting-on-ACP Status: PR has an ACP and is waiting for the ACP to complete. label Nov 13, 2022

This was referenced Nov 15, 2022

ACP: std::ffi::c and std::ffi::os submodules rust-lang/libs-team#134

Closed

ACP: CStr::bytes iterator rust-lang/libs-team#135

Closed

Dylan-DPC removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 27, 2023

clarfonthey force-pushed the cstr-bytes-iter branch from b3c41f3 to 1867de5 Compare May 30, 2023 19:50

clarfonthey mentioned this pull request May 30, 2023

Tracking Issue for CStr::bytes #112115

Open

7 tasks

clarfonthey force-pushed the cstr-bytes-iter branch from 1867de5 to 8f2771f Compare May 30, 2023 19:55

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 30, 2023

rustbot added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 31, 2023

Dylan-DPC removed the S-waiting-on-ACP Status: PR has an ACP and is waiting for the ACP to complete. label Jul 28, 2023

rustbot assigned joshtriplett and unassigned thomcc Feb 1, 2024

rustbot assigned cuviper and unassigned joshtriplett Feb 11, 2024

Reduce unsafe code, use more NonNull APIs per @cuviper review

a38a556

clarfonthey force-pushed the cstr-bytes-iter branch from 0a90d2d to a38a556 Compare March 12, 2024 21:21

clarfonthey commented Mar 12, 2024

View reviewed changes

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 Mar 13, 2024

matthiaskrgr mentioned this pull request Mar 13, 2024

Rollup of 12 pull requests #122444

Closed

matthiaskrgr mentioned this pull request Mar 13, 2024

Rollup of 10 pull requests #122453

Closed

matthiaskrgr mentioned this pull request Mar 13, 2024

Rollup of 9 pull requests #122457

Closed

matthiaskrgr mentioned this pull request Mar 14, 2024

Rollup of 11 pull requests #122466

Closed

jhpratt mentioned this pull request Mar 14, 2024

Rollup of 10 pull requests #122472

Closed

This was referenced Mar 14, 2024

Rollup of 10 pull requests #122474

Closed

Rollup of 9 pull requests #122483

Merged

bors merged commit 1ae69ae into rust-lang:master Mar 14, 2024
11 checks passed

rustbot added this to the 1.78.0 milestone Mar 14, 2024

clarfonthey deleted the cstr-bytes-iter branch March 21, 2024 02:17

dtolnay mentioned this pull request Mar 24, 2024

Tracking Issue for cstr_count_bytes #114441

Closed

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add CStr::bytes iterator #104353

Add CStr::bytes iterator #104353

clarfonthey commented Nov 13, 2022 •

edited

Loading

rustbot commented Nov 13, 2022

rustbot commented Nov 13, 2022

This comment has been minimized.

thomcc commented Nov 13, 2022

clarfonthey commented Nov 15, 2022

clarfonthey commented May 30, 2023

clarfonthey commented May 30, 2023 •

edited

Loading

clarfonthey commented May 31, 2023

bors commented Sep 20, 2023

thomcc commented Feb 1, 2024

joshtriplett commented Feb 11, 2024

clarfonthey commented Mar 11, 2024

clarfonthey Mar 12, 2024 •

edited

Loading

cuviper Mar 12, 2024

clarfonthey Mar 13, 2024

cuviper Mar 13, 2024

cuviper commented Mar 13, 2024

bors commented Mar 13, 2024

Add CStr::bytes iterator #104353

Add CStr::bytes iterator #104353

Conversation

clarfonthey commented Nov 13, 2022 • edited Loading

rustbot commented Nov 13, 2022

rustbot commented Nov 13, 2022

This comment has been minimized.

thomcc commented Nov 13, 2022

clarfonthey commented Nov 15, 2022

clarfonthey commented May 30, 2023

clarfonthey commented May 30, 2023 • edited Loading

clarfonthey commented May 31, 2023

bors commented Sep 20, 2023

thomcc commented Feb 1, 2024

joshtriplett commented Feb 11, 2024

clarfonthey commented Mar 11, 2024

clarfonthey Mar 12, 2024 • edited Loading

Choose a reason for hiding this comment

cuviper Mar 12, 2024

Choose a reason for hiding this comment

clarfonthey Mar 13, 2024

Choose a reason for hiding this comment

cuviper Mar 13, 2024

Choose a reason for hiding this comment

cuviper commented Mar 13, 2024

bors commented Mar 13, 2024

clarfonthey commented Nov 13, 2022 •

edited

Loading

clarfonthey commented May 30, 2023 •

edited

Loading

clarfonthey Mar 12, 2024 •

edited

Loading