Rollup merge of #59351 - phil-opp:llvm-ar, r=alexcrichton

[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 d9bc21861c90da0c74391637aa174d81a6053fd6..3f8e67a7af85ee7408029d70d9ca36a1c3c8bb58 100644 (file)
--- a/src/libstd/sys/cloudabi/mod.rs
+++ b/src/libstd/sys/cloudabi/mod.rs
@@ -1,5 +1,5 @@
-use libc;
-use mem;
+use crate::io::ErrorKind;
+use crate::mem;
 
 #[path = "../unix/alloc.rs"]
 pub mod alloc;
@@ -14,8 +14,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 +22,8 @@
 pub mod thread_local;
 pub mod time;
 
+pub use crate::sys_common::os_str_bytes as os_str;
+
 mod abi;
 
 mod shims;
@@ -32,29 +32,29 @@
 #[allow(dead_code)]
 pub fn init() {}
 
-pub fn decode_error_kind(errno: i32) -> ::io::ErrorKind {
+pub fn decode_error_kind(errno: i32) -> ErrorKind {
     match errno {
-        x if x == abi::errno::ACCES as i32 => ::io::ErrorKind::PermissionDenied,
-        x if x == abi::errno::ADDRINUSE as i32 => ::io::ErrorKind::AddrInUse,
-        x if x == abi::errno::ADDRNOTAVAIL as i32 => ::io::ErrorKind::AddrNotAvailable,
-        x if x == abi::errno::AGAIN as i32 => ::io::ErrorKind::WouldBlock,
-        x if x == abi::errno::CONNABORTED as i32 => ::io::ErrorKind::ConnectionAborted,
-        x if x == abi::errno::CONNREFUSED as i32 => ::io::ErrorKind::ConnectionRefused,
-        x if x == abi::errno::CONNRESET as i32 => ::io::ErrorKind::ConnectionReset,
-        x if x == abi::errno::EXIST as i32 => ::io::ErrorKind::AlreadyExists,
-        x if x == abi::errno::INTR as i32 => ::io::ErrorKind::Interrupted,
-        x if x == abi::errno::INVAL as i32 => ::io::ErrorKind::InvalidInput,
-        x if x == abi::errno::NOENT as i32 => ::io::ErrorKind::NotFound,
-        x if x == abi::errno::NOTCONN as i32 => ::io::ErrorKind::NotConnected,
-        x if x == abi::errno::PERM as i32 => ::io::ErrorKind::PermissionDenied,
-        x if x == abi::errno::PIPE as i32 => ::io::ErrorKind::BrokenPipe,
-        x if x == abi::errno::TIMEDOUT as i32 => ::io::ErrorKind::TimedOut,
-        _ => ::io::ErrorKind::Other,
+        x if x == abi::errno::ACCES as i32 => ErrorKind::PermissionDenied,
+        x if x == abi::errno::ADDRINUSE as i32 => ErrorKind::AddrInUse,
+        x if x == abi::errno::ADDRNOTAVAIL as i32 => ErrorKind::AddrNotAvailable,
+        x if x == abi::errno::AGAIN as i32 => ErrorKind::WouldBlock,
+        x if x == abi::errno::CONNABORTED as i32 => ErrorKind::ConnectionAborted,
+        x if x == abi::errno::CONNREFUSED as i32 => ErrorKind::ConnectionRefused,
+        x if x == abi::errno::CONNRESET as i32 => ErrorKind::ConnectionReset,
+        x if x == abi::errno::EXIST as i32 => ErrorKind::AlreadyExists,
+        x if x == abi::errno::INTR as i32 => ErrorKind::Interrupted,
+        x if x == abi::errno::INVAL as i32 => ErrorKind::InvalidInput,
+        x if x == abi::errno::NOENT as i32 => ErrorKind::NotFound,
+        x if x == abi::errno::NOTCONN as i32 => ErrorKind::NotConnected,
+        x if x == abi::errno::PERM as i32 => ErrorKind::PermissionDenied,
+        x if x == abi::errno::PIPE as i32 => ErrorKind::BrokenPipe,
+        x if x == abi::errno::TIMEDOUT as i32 => ErrorKind::TimedOut,
+        _ => ErrorKind::Other,
     }
 }
 
 pub unsafe fn abort_internal() -> ! {
-    ::core::intrinsics::abort();
+    core::intrinsics::abort();
 }
 
 pub use libc::strlen;