auto merge of #14696 : jakub-/rust/dead-struct-fields, r=alexcrichton

[rust.git] / src / libstd / rt / backtrace.rs

diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs
index f1717c3a2ba29350937dd9a12fe3e034ae16de43..a1372b51d472a51e5e1b5bc8785d15ffd2e0451c 100644 (file)
--- a/src/libstd/rt/backtrace.rs
+++ b/src/libstd/rt/backtrace.rs
@@ -13,7 +13,7 @@
 #![allow(non_camel_case_types)]
 
 use char::Char;
-use container::Container;
+use collections::Collection;
 use from_str::from_str;
 use io::{IoResult, Writer};
 use iter::Iterator;
@@ -349,7 +349,7 @@ fn dladdr(addr: *libc::c_void,
 
     #[cfg(not(target_os = "macos"))]
     fn print(w: &mut Writer, idx: int, addr: *libc::c_void) -> IoResult<()> {
-        use container::Container;
+        use collections::Collection;
         use iter::Iterator;
         use os;
         use path::GenericPath;
@@ -603,7 +603,7 @@ pub unsafe fn _Unwind_FindEnclosingFunction(pc: *libc::c_void)
 #[allow(dead_code, uppercase_variables)]
 mod imp {
     use c_str::CString;
-    use container::Container;
+    use core_collections::Collection;
     use intrinsics;
     use io::{IoResult, Writer};
     use libc;
@@ -615,7 +615,7 @@ mod imp {
     use rt::mutex::{StaticNativeMutex, NATIVE_MUTEX_INIT};
     use slice::ImmutableVector;
     use str::StrSlice;
-    use unstable::dynamic_lib::DynamicLibrary;
+    use dynamic_lib::DynamicLibrary;
 
     #[allow(non_snake_case_functions)]
     extern "system" {