about summary refs log tree commit diff
path: root/src/libstd/sys_common/mod.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-02-28 11:38:40 +0000
committerbors <bors@rust-lang.org>2019-02-28 11:38:40 +0000
commit190feb65290d39d7ab6d44e994bd99188d339f16 (patch)
tree0dc440124b61d17495c4b8e4e680b38cd7b0fa13 /src/libstd/sys_common/mod.rs
parent7e001e5c6c7c090b41416a57d4be412ed3ccd937 (diff)
parentaad9e29f52988c55cd8cee2bd181a2e3c9d436a4 (diff)
downloadrust-190feb65290d39d7ab6d44e994bd99188d339f16.tar.gz
rust-190feb65290d39d7ab6d44e994bd99188d339f16.zip
Auto merge of #58208 - taiki-e:libstd-2018, r=Centril
libstd => 2018

Transitions `libstd` to Rust 2018; cc #58099

r? @Centril
Diffstat (limited to 'src/libstd/sys_common/mod.rs')
-rw-r--r--src/libstd/sys_common/mod.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/sys_common/mod.rs b/src/libstd/sys_common/mod.rs
index c18b603a635..1fc32365408 100644
--- a/src/libstd/sys_common/mod.rs
+++ b/src/libstd/sys_common/mod.rs
@@ -15,11 +15,11 @@
 #![allow(missing_docs)]
 #![allow(missing_debug_implementations)]
 
-use sync::Once;
-use sys;
+use crate::sync::Once;
+use crate::sys;
 
 macro_rules! rtabort {
-    ($($t:tt)*) => (::sys_common::util::abort(format_args!($($t)*)))
+    ($($t:tt)*) => (crate::sys_common::util::abort(format_args!($($t)*)))
 }
 
 macro_rules! rtassert {
@@ -52,7 +52,7 @@ cfg_if! {
                  target_os = "redox",
                  all(target_arch = "wasm32", not(target_os = "emscripten")),
                  all(target_vendor = "fortanix", target_env = "sgx")))] {
-        pub use sys::net;
+        pub use crate::sys::net;
     } else {
         pub mod net;
     }