From 7a6c54c46e6ac28d82f940f1d1bf8d0a5fd7e820 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 10 Dec 2014 07:37:33 -0800
Subject: [PATCH] Fix compilation on linux

---
 src/libstd/os.rs                 |  1 -
 src/libstd/rt/args.rs            | 14 +++++++-------
 src/libstd/sys/unix/backtrace.rs |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index 0ff41586e72..9ec3128302c 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -57,7 +57,6 @@ use sync::atomic::{AtomicInt, INIT_ATOMIC_INT, SeqCst};
 use vec::Vec;
 
 #[cfg(unix)] use c_str::ToCStr;
-#[cfg(unix)] use libc::c_char;
 
 #[cfg(unix)]
 pub use sys::ext as unix;
diff --git a/src/libstd/rt/args.rs b/src/libstd/rt/args.rs
index fed0554863c..3a4705f58b4 100644
--- a/src/libstd/rt/args.rs
+++ b/src/libstd/rt/args.rs
@@ -51,10 +51,10 @@ mod imp {
     use string::String;
     use mem;
 
-    use sync::mutex::{StaticMutex, MUTEX_INIT};
+    use sync::{StaticMutex, MUTEX_INIT};
 
     static mut GLOBAL_ARGS_PTR: uint = 0;
-    static LOCK: NativeMutex = MUTEX_INIT;
+    static LOCK: StaticMutex = MUTEX_INIT;
 
     pub unsafe fn init(argc: int, argv: *const *const u8) {
         let args = load_argc_and_argv(argc, argv);
@@ -67,7 +67,7 @@ mod imp {
     }
 
     pub fn take() -> Option<Vec<Vec<u8>>> {
-        let guard = LOCK.lock();
+        let _guard = LOCK.lock();
         unsafe {
             let ptr = get_global_ptr();
             let val = mem::replace(&mut *ptr, None);
@@ -76,7 +76,7 @@ mod imp {
     }
 
     pub fn put(args: Vec<Vec<u8>>) {
-        let guard = LOCK.lock();
+        let _guard = LOCK.lock();
         unsafe {
             let ptr = get_global_ptr();
             rtassert!((*ptr).is_none());
@@ -85,7 +85,7 @@ mod imp {
     }
 
     pub fn clone() -> Option<Vec<Vec<u8>>> {
-        let guard = LOCK.lock();
+        let _guard = LOCK.lock();
         unsafe {
             let ptr = get_global_ptr();
             (*ptr).as_ref().map(|s: &Box<Vec<Vec<u8>>>| (**s).clone())
@@ -104,8 +104,8 @@ mod imp {
 
     #[cfg(test)]
     mod tests {
-        use std::prelude::*;
-        use std::finally::Finally;
+        use prelude::*;
+        use finally::Finally;
 
         use super::*;
 
diff --git a/src/libstd/sys/unix/backtrace.rs b/src/libstd/sys/unix/backtrace.rs
index 5256e2cc809..d98f935076f 100644
--- a/src/libstd/sys/unix/backtrace.rs
+++ b/src/libstd/sys/unix/backtrace.rs
@@ -241,7 +241,7 @@ fn print(w: &mut Writer, idx: int, addr: *mut libc::c_void) -> IoResult<()> {
 
 #[cfg(not(any(target_os = "macos", target_os = "ios")))]
 fn print(w: &mut Writer, idx: int, addr: *mut libc::c_void) -> IoResult<()> {
-    use iter::Iterator;
+    use iter::{Iterator, IteratorExt};
     use os;
     use path::GenericPath;
     use ptr::RawPtr;