diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-12-21 00:04:11 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-12-21 09:27:34 -0800 |
| commit | cfc815bef4b7fec0f77255188b582b4b7b5e73ca (patch) | |
| tree | e7ce6052c39c5289cab537cf0f98c07ad885fcdb /src/libstd/sys | |
| parent | a3dfaa62feadb1bae4ba650cc5d19fd0b1252bd8 (diff) | |
| parent | e5d8c855079e08e1aab2cf7b4e5110159ad8fa53 (diff) | |
| download | rust-cfc815bef4b7fec0f77255188b582b4b7b5e73ca.tar.gz rust-cfc815bef4b7fec0f77255188b582b4b7b5e73ca.zip | |
rollup merge of #20029: vhbit/ios-no-rt
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/backtrace.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/unix/backtrace.rs b/src/libstd/sys/unix/backtrace.rs index df9dbad2ec7..983d0e5fa14 100644 --- a/src/libstd/sys/unix/backtrace.rs +++ b/src/libstd/sys/unix/backtrace.rs @@ -105,7 +105,7 @@ use sys_common::backtrace::*; #[cfg(all(target_os = "ios", target_arch = "arm"))] #[inline(never)] pub fn write(w: &mut Writer) -> IoResult<()> { - use iter::{Iterator, range}; + use iter::{IteratorExt, range}; use result; use slice::SliceExt; @@ -117,7 +117,7 @@ pub fn write(w: &mut Writer) -> IoResult<()> { // while it doesn't requires lock for work as everything is // local, it still displays much nicer backtraces when a // couple of tasks panic simultaneously - static LOCK: StaticNativeMutex = NATIVE_MUTEX_INIT; + static LOCK: StaticMutex = MUTEX_INIT; let _g = unsafe { LOCK.lock() }; try!(writeln!(w, "stack backtrace:")); |