about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-08-28 04:28:23 +0000
committerbors <bors@rust-lang.org>2015-08-28 04:28:23 +0000
commit6f28232756a6842acb1d2da6defdea43cfe95dde (patch)
tree7ab7bd958ea06555f2fbaec29dfda6516da85589 /src/libstd
parent3a804114158dbde947cd9fffc2ad28be9c1dd14c (diff)
parentc5ab1166e7869dd8188beba435c8557b221db93b (diff)
downloadrust-6f28232756a6842acb1d2da6defdea43cfe95dde.tar.gz
rust-6f28232756a6842acb1d2da6defdea43cfe95dde.zip
Auto merge of #28054 - zaeleus:ios-imports, r=alexcrichton
This fixes building for ios targets caused by 7925c79.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/sys/unix/backtrace/tracing/backtrace_fn.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libstd/sys/unix/backtrace/tracing/backtrace_fn.rs b/src/libstd/sys/unix/backtrace/tracing/backtrace_fn.rs
index 2865abb254c..46f276aecf4 100644
--- a/src/libstd/sys/unix/backtrace/tracing/backtrace_fn.rs
+++ b/src/libstd/sys/unix/backtrace/tracing/backtrace_fn.rs
@@ -20,18 +20,15 @@
 
 use io;
 use io::prelude::*;
-use iter::Iterator;
 use libc;
 use mem;
 use result::Result::Ok;
 use sync::StaticMutex;
 
-use super::printer::print;
+use super::super::printing::print;
 
 #[inline(never)]
 pub fn write(w: &mut Write) -> io::Result<()> {
-    use mem;
-
     extern {
         fn backtrace(buf: *mut *mut libc::c_void,
                      sz: libc::c_int) -> libc::c_int;