Rollup merge of #61120 - spastorino:eval-place-iterate, r=oli-obk

[rust.git] / src / libstd / sys / cloudabi / mod.rs

diff --git a/src/libstd/sys/cloudabi/mod.rs b/src/libstd/sys/cloudabi/mod.rs
index 47c90fddd867f72c071a2e928e092506de14b261..c3b8bbd042606e17e1581d236a7fdb0975aebe21 100644 (file)
--- a/src/libstd/sys/cloudabi/mod.rs
+++ b/src/libstd/sys/cloudabi/mod.rs
@@ -4,8 +4,6 @@
 #[path = "../unix/alloc.rs"]
 pub mod alloc;
 pub mod args;
-#[cfg(feature = "backtrace")]
-pub mod backtrace;
 #[path = "../unix/cmath.rs"]
 pub mod cmath;
 pub mod condvar;
@@ -14,8 +12,6 @@
 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 +20,8 @@
 pub mod thread_local;
 pub mod time;
 
+pub use crate::sys_common::os_str_bytes as os_str;
+
 mod abi;
 
 mod shims;