Move os_str_bytes to sys::unix
#86509
Merged
Conversation
This file contains 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
added
the
S-waiting-on-review
CDirkx
commented
Jun 21, 2021
| @@ -27,10 27,6 @@ pub mod fs; | |||
| pub mod io; | |||
| pub mod memchr; | |||
| pub mod mutex; | |||
| // `doc` is required because `sys/mod.rs` imports `unix/ext/mod.rs` on Windows | |||
| // when generating documentation. | |||
| #[cfg(any(doc, not(windows)))] | |||
There was a problem hiding this comment.
Not needed anymore, this now completely falls under the cfg logic in std::os and std::sys
CDirkx
commented
Jun 21, 2021
| @@ -4,8 4,6 @@ pub mod memchr { | |||
| pub use core::slice::memchr::{memchr, memrchr}; | |||
| } | |||
|
|
|||
| pub use crate::sys_common::os_str_bytes as os_str; | |||
There was a problem hiding this comment.
Should os_str be here? Both wasi and wasm do use common::* but define os_str themselves anyway.
|
☔ The latest upstream changes (presumably #86817) made this pull request unmergeable. Please resolve the merge conflicts. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
CDirkx
commented
Jul 3, 2021
| @@ -13,6 13,7 @@ use crate::sys_common::{AsInner, IntoInner}; | |||
| use core::str::lossy::{Utf8Lossy, Utf8LossyChunk}; | |||
|
|
|||
| #[cfg(test)] | |||
| #[path = "../unix/os_str/tests.rs"] | |||
There was a problem hiding this comment.
To avoid duplicating the test, could alternatively be cfg(unix).
JohnCSimon
added
S-waiting-on-review
|
Thanks! @bors r |
|
📌 Commit c93cb40 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 2, 2021
Rollup of 13 pull requests Successful merges: - rust-lang#86183 (Change environment variable getters to error recoverably) - rust-lang#86439 (Remove `Ipv4Addr::is_ietf_protocol_assignment`) - rust-lang#86509 (Move `os_str_bytes` to `sys::unix`) - rust-lang#86593 (Partially stabilize `const_slice_first_last`) - rust-lang#86936 (Add documentation for `Ipv6MulticastScope`) - rust-lang#87282 (Ensure `./x.py dist` adheres to `build.tools`) - rust-lang#87468 (Update rustfmt) - rust-lang#87504 (Update mdbook.) - rust-lang#87608 (Remove unused field `Session.system_library_path`) - rust-lang#87629 (Consistent spelling of "adapter" in the standard library) - rust-lang#87633 (Update compiler_builtins to fix i128 shift/mul on thumbv6m) - rust-lang#87644 (Recommend `swap_remove` in `Vec::remove` docs) - rust-lang#87653 (mark a UB doctest as no_run) 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.
Followup to #84967, with
OsStrExtandOsStringExtmoved out ofsys_common, there is no reason anymore foros_str_bytesto live insys_commonand not in sys. This pr moves it to the locationsys::unix::os_strand reuses the code on other platforms via#[path](as is common insys) instead of importing.