diff options
| author | bors <bors@rust-lang.org> | 2019-03-22 17:34:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-22 17:34:06 +0000 |
| commit | cb2f34dc6d7e83d8bcfef79e0388d49f0c24aca7 (patch) | |
| tree | 68f4c730b3f4486210f1114adde53435533d2a54 /src/libstd/sys/cloudabi | |
| parent | ed196221d889ae8a87be677402e4319237ef67f4 (diff) | |
| parent | 2079df1c8740dd76d5c28bb8f6193826f6afdec4 (diff) | |
| download | rust-cb2f34dc6d7e83d8bcfef79e0388d49f0c24aca7.tar.gz rust-cb2f34dc6d7e83d8bcfef79e0388d49f0c24aca7.zip | |
Auto merge of #58953 - jethrogb:jb/unify-ffi, r=alexcrichton
Unify OsString/OsStr for byte-based implementations As requested in #57860 r? @joshtriplett
Diffstat (limited to 'src/libstd/sys/cloudabi')
| -rw-r--r-- | src/libstd/sys/cloudabi/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/cloudabi/mod.rs b/src/libstd/sys/cloudabi/mod.rs index 47c90fddd86..3f8e67a7af8 100644 --- a/src/libstd/sys/cloudabi/mod.rs +++ b/src/libstd/sys/cloudabi/mod.rs @@ -14,8 +14,6 @@ pub mod io; pub mod memchr; pub mod mutex; pub mod os; -#[path = "../unix/os_str.rs"] -pub mod os_str; pub mod rwlock; pub mod stack_overflow; pub mod stdio; @@ -24,6 +22,8 @@ pub mod thread; pub mod thread_local; pub mod time; +pub use crate::sys_common::os_str_bytes as os_str; + mod abi; mod shims; |