about summary refs log tree commit diff
path: root/src/libstd/sys_common/backtrace.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/backtrace.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/backtrace.rs')
-rw-r--r--src/libstd/sys_common/backtrace.rs19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/libstd/sys_common/backtrace.rs b/src/libstd/sys_common/backtrace.rs
index 347244b0e0d..1a80908779e 100644
--- a/src/libstd/sys_common/backtrace.rs
+++ b/src/libstd/sys_common/backtrace.rs
@@ -1,17 +1,18 @@
 /// Common code for printing the backtrace in the same way across the different
 /// supported platforms.
 
-use env;
-use io::prelude::*;
-use io;
-use path::{self, Path};
-use ptr;
+use crate::env;
+use crate::io::prelude::*;
+use crate::io;
+use crate::path::{self, Path};
+use crate::ptr;
+use crate::str;
+use crate::sync::atomic::{self, Ordering};
+use crate::sys::mutex::Mutex;
+
 use rustc_demangle::demangle;
-use str;
-use sync::atomic::{self, Ordering};
-use sys::mutex::Mutex;
 
-pub use sys::backtrace::{
+pub use crate::sys::backtrace::{
     unwind_backtrace,
     resolve_symname,
     foreach_symbol_fileline,