diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2021-08-02 11:03:20 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 11:03:20 +0900 |
| commit | 1176d306cdd22e64aa9ffe0dad953c38deba1f42 (patch) | |
| tree | 243fb8bc6c31e908f2a87afe30240e097ff97aef /library/std/src/sys/wasi | |
| parent | a03d6da3ef7852cbcfcf98b7639b529b96587ca3 (diff) | |
| parent | c93cb40b90b5f862bf448136cbe608f43ae0f62f (diff) | |
Rollup merge of #86509 - CDirkx:os_str, r=m-ou-se
Move `os_str_bytes` to `sys::unix` Followup to #84967, with `OsStrExt` and `OsStringExt` moved out of `sys_common`, there is no reason anymore for `os_str_bytes` to live in `sys_common` and not in sys. This pr moves it to the location `sys::unix::os_str` and reuses the code on other platforms via `#[path]` (as is common in `sys`) instead of importing.
Diffstat (limited to 'library/std/src/sys/wasi')
| -rw-r--r-- | library/std/src/sys/wasi/mod.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/library/std/src/sys/wasi/mod.rs b/library/std/src/sys/wasi/mod.rs index 4af99bfa464..8d62335aae5 100644 --- a/library/std/src/sys/wasi/mod.rs +++ b/library/std/src/sys/wasi/mod.rs @@ -32,7 +32,8 @@ pub mod io; pub mod mutex; pub mod net; pub mod os; -pub use crate::sys_common::os_str_bytes as os_str; +#[path = "../unix/os_str.rs"] +pub mod os_str; #[path = "../unix/path.rs"] pub mod path; #[path = "../unsupported/pipe.rs"] |