Merge sys_common::bytestring back into os_str_bytes
#85001
Merged
+28
−50
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
T-libs
|
(rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
JohnCSimon
added
S-waiting-on-review
crlf0710
added
S-waiting-on-review
CDirkx
changed the title
sys_common::bytestring into os_str_bytessys_common::bytestring back into os_str_bytes
|
☔ The latest upstream changes (presumably #84967) made this pull request unmergeable. Please resolve the merge conflicts. |
|
r? @JohnTitor @bors r+ |
|
📌 Commit 059008f has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 2, 2021
Rollup of 7 pull requests Successful merges: - rust-lang#84029 (add `track_path::path` fn for usage in `proc_macro`s) - rust-lang#85001 (Merge `sys_common::bytestring` back into `os_str_bytes`) - rust-lang#86308 (Docs: clarify that certain intrinsics are not unsafe) - rust-lang#86796 (Add a regression test for issue-70703) - rust-lang#86803 (Remove & from Command::args calls in documentation) - rust-lang#86807 (Fix double import in wasm thread ) - rust-lang#86813 (Add a help message to `unused_doc_comments` lint) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
bytestringcontains code for correctly debug formatting a byte slice ([u8]). This functionality is and has historically only been used to provide the debug formatting of byte-based os-strings (on unix etc.).Having this functionality in the separate
bytestringmodule was useful in the past to reduce duplication, as when it was addedos_str_byteswas still split intosys::{unix, redox, wasi, etc.}::os_str. However, now that is no longer the case, there is not much reason for thebytestringfunctionality to be separate fromos_str_bytes; I don't think it is very likely that another part of std will need to handle formatting byte strings that are not os-strings in the future (everything should beutf8). This is why this PR merges the functionality ofbytestringdirectly into the debug implementation inos_str_bytes.