bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #86509 - CDirkx:os_str, r=m-ou-se

Browse source 
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.
This commit is contained in:
Yuki Okushi 2021-08-02 11:03:20 +09:00 • committed by GitHub
commit 1176d306cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
library/std/src/sys/unix/mod.rs
View file

@ -30,6 +30,7 @@ pub mod net;
#[cfg(target_os = "l4re")]
pub use self::l4re::net;
pub mod os;
pub mod os_str;
pub mod path;
pub mod pipe;
pub mod process;
@ -42,8 +43,6 @@ pub mod thread_local_dtor;
pub mod thread_local_key;
pub mod time;
pub use crate::sys_common::os_str_bytes as os_str;
// SAFETY: must be called only once during runtime initialization.
// NOTE: this is not guaranteed to run, for example when Rust code is called externally.
pub unsafe fn init(argc: isize, argv: *const *const u8) {