Test fixes from the rollup

diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs
index e9ea3a7b304e07c85612a485bd5faef921192b78..2a4774ffd84d4f5574edc73f1b7ef0c79fe00f4c 100644 (file)
--- a/src/librustdoc/clean/inline.rs
+++ b/src/librustdoc/clean/inline.rs
@@ -88,7 +88,7 @@ fn try_inline_def(cx: &core::DocContext,
             record_extern_fqn(cx, did, clean::TypeModule);
             clean::ModuleItem(build_module(cx, tcx, did))
         }
-        ast::DefStatic(did, mtbl) => {
+        def::DefStatic(did, mtbl) => {
             record_extern_fqn(cx, did, clean::TypeStatic);
             clean::StaticItem(build_static(tcx, did, mtbl))
         }

diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs
index fe6d84d4d2e2a4bb6cf24bde1e2ab8b9459de83d..94472ee72414c0b4fe65e30d831d25f1406b9512 100644 (file)
--- a/src/libstd/rt/backtrace.rs
+++ b/src/libstd/rt/backtrace.rs
@@ -505,7 +505,6 @@ mod imp {
     use c_str::CString;
     use container::Container;
     use io::{IoResult, Writer};
-    use iter::Iterator;
     use libc;
     use mem;
     use ops::Drop;