Stabilize CString::from_vec_with_nul[_unchecked]#89292

CleanCut · 2021-09-27T03:44:42Z

Closes the tracking issue #73179. I am keeping this in draft mode until the FCP has ended.

This is my first time stabilizing a feature, so I would appreciate any guidance on things I should do differently.

rust-highfive · 2021-09-27T03:44:45Z

(rust-highfive has picked a reviewer for you, use r? to override)

CleanCut · 2021-09-27T03:45:54Z

Hmm, apparently rust-highfive doesn't distinguish between draft-mode PRs and regular ones. 😬 In the future, if I want to keep things low-key I'll wait until later to create the PR.

nagisa · 2021-09-27T13:31:08Z

You can r? @ghost in the description when creating the PR to have highfive to ignore auto-assignment.

CleanCut · 2021-09-27T20:16:08Z

@nagisa TIL, thanks!

It turns out that using vec as a buffer works, and it is even more performant. And when rust-lang/rust#89292 will be merged, things will be even simpler (no pop from the buffer).

joshtriplett · 2021-10-04T02:04:10Z

This seems reasonable to me. Tagging as waiting-on-fcp; the FCP is in the tracking issue.

bors · 2021-10-11T10:25:16Z

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

bors · 2021-10-12T21:05:09Z

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

library/std/src/ffi/c_str.rs

JohnTitor · 2021-10-20T05:25:56Z

FCP has been complete, could you rebase onto master instead of merging?

CleanCut · 2021-10-20T17:09:05Z

FCP has been complete, could you rebase onto master instead of merging?

Absolutely. Is there a bors way of doing this, or should I do it manually and force-push?

CleanCut · 2021-10-20T17:23:27Z

@JohnTitor 🤔 I do not know what to do about the error that changing the version caused. Perhaps rebasing will fix it?

error[E0711]: feature `cstring_from_vec_with_nul` is declared stable since 1.58.0, but was previously declared stable since 1.57.0

JohnTitor · 2021-10-20T18:24:38Z

Absolutely. Is there a bors way of doing this, or should I do it manually and force-push?

It exists but has some bugs/undesired behavior e.g. rust-lang/homu#158. So I recommend force-pushing.

@JohnTitor 🤔 I do not know what to do about the error that changing the version caused. Perhaps rebasing will fix it?

That's because you changed the version number as an additional commit, squashing commits into one should fix it.

CleanCut · 2021-10-20T20:20:51Z

✅ Squashed and rebased

CleanCut · 2021-10-20T20:44:19Z

🤔 I've squashed down to a single commit, but CI is still unhappy about the multiple version numbers.

library/std/src/ffi/mod.rs

Co-authored-by: Yuki Okushi <jtitor@2k36.org>

JohnTitor · 2021-10-20T22:16:39Z

Thanks! r+'ing in favor of FCP.
r? @JohnTitor @bors r+

bors · 2021-10-20T22:16:41Z

📌 Commit 39af41e has been approved by JohnTitor

…_with_nul, r=JohnTitor Stabilize CString::from_vec_with_nul[_unchecked] Closes the tracking issue rust-lang#73179. I am keeping this in _draft_ mode until the FCP has ended. This is my first time stabilizing a feature, so I would appreciate any guidance on things I should do differently. Closes rust-lang#73179

Rollup of 14 pull requests Successful merges: - rust-lang#86984 (Reject octal zeros in IPv4 addresses) - rust-lang#87440 (Remove unnecessary condition in Barrier::wait()) - rust-lang#88644 (`AbstractConst` private fields) - rust-lang#89292 (Stabilize CString::from_vec_with_nul[_unchecked]) - rust-lang#90010 (Avoid overflow in `VecDeque::with_capacity_in()`.) - rust-lang#90029 (Add test for debug logging during incremental compilation) - rust-lang#90031 (config: add the option to enable LLVM tests) - rust-lang#90048 (Add test for line-number setting) - rust-lang#90071 (Remove hir::map::blocks and use FnKind instead) - rust-lang#90074 (2229 migrations small cleanup) - rust-lang#90077 (Make `From` impls of NonZero integer const.) - rust-lang#90097 (Add test for duplicated sidebar entries for reexported macro) - rust-lang#90098 (Add test to ensure that the missing_doc_code_examples is not triggered on foreign trait implementations) - rust-lang#90099 (Fix MIRI UB in `Vec::swap_remove`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rust-highfive assigned joshtriplett Sep 27, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 27, 2021

This comment has been minimized.

Sign in to view

CleanCut mentioned this pull request Sep 27, 2021

Tracking Issue for methods to go from nul-terminated Vec<u8> to CString #73179

Closed

CleanCut marked this pull request as ready for review October 4, 2021 23:33

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 11, 2021

JohnTitor reviewed Oct 20, 2021

View reviewed changes

library/std/src/ffi/c_str.rs Outdated Show resolved Hide resolved

JohnTitor removed the S-waiting-on-fcp Status: PR is in FCP and is awaiting for FCP to complete. label Oct 20, 2021

This comment has been minimized.

Sign in to view

stabilize CString::from_vec_with_nul[_unchecked]

86b3dd9

CleanCut force-pushed the stabilize-cstring_from_vec_with_nul branch from 3a585f6 to 86b3dd9 Compare October 20, 2021 20:19

This comment has been minimized.

Sign in to view

JohnTitor reviewed Oct 20, 2021

View reviewed changes

library/std/src/ffi/mod.rs Outdated Show resolved Hide resolved

fix 'since' version number

39af41e

Co-authored-by: Yuki Okushi <jtitor@2k36.org>

JohnTitor approved these changes Oct 20, 2021

View reviewed changes

rust-highfive assigned JohnTitor and unassigned joshtriplett Oct 20, 2021

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 Oct 20, 2021

JohnTitor mentioned this pull request Oct 21, 2021

Rollup of 15 pull requests #90118

Closed

JohnTitor mentioned this pull request Oct 21, 2021

Rollup of 14 pull requests #90119

Merged

bors merged commit 20687bb into rust-lang:master Oct 21, 2021

rustbot added this to the 1.58.0 milestone Oct 21, 2021

CleanCut deleted the stabilize-cstring_from_vec_with_nul branch October 21, 2021 19:13

VictorKoenders mentioned this pull request Oct 25, 2021

Unblocked TODO: /rust-lang/rust/issues/73179 was closed. bincode-org/bincode#416

Closed

Uh oh!

Conversation

CleanCut commented Sep 27, 2021 • edited by JohnTitor Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Sep 27, 2021

Uh oh!

CleanCut commented Sep 27, 2021

Uh oh!

This comment has been minimized.

nagisa commented Sep 27, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

CleanCut commented Sep 27, 2021

Uh oh!

joshtriplett commented Oct 4, 2021

Uh oh!

bors commented Oct 11, 2021

Uh oh!

bors commented Oct 12, 2021

Uh oh!

Uh oh!

JohnTitor commented Oct 20, 2021

Uh oh!

CleanCut commented Oct 20, 2021

Uh oh!

This comment has been minimized.

CleanCut commented Oct 20, 2021

Uh oh!

JohnTitor commented Oct 20, 2021

Uh oh!

CleanCut commented Oct 20, 2021

Uh oh!

This comment has been minimized.

CleanCut commented Oct 20, 2021

Uh oh!

Uh oh!

JohnTitor commented Oct 20, 2021

Uh oh!

bors commented Oct 20, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

CleanCut commented Sep 27, 2021 •

edited by JohnTitor

Loading

nagisa commented Sep 27, 2021 •

edited

Loading