---

yaml
---
r: 149003
b: refs/heads/try2
c: f7eb705
h: refs/heads/master
i:
  149001: a014f1a
  148999: 68b6e40
v: v3

Author: omasanori

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: dd071eeeb8acc4ef616a18c468e889d2aa7782c2
+refs/heads/try2: f7eb7052484fa56d789778ea66039b17add4e033
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/driver/driver.rs

@@ -1181,7 +1181,6 @@ mod test {
     use getopts::getopts;
     use syntax::attr;
     use syntax::attr::AttrMetaMethods;
-    use syntax::diagnostic;
 
     // When the user supplies --test we should implicitly supply --cfg test
     #[test]

branches/try2/src/libstd/unit.rs

@@ -12,6 +12,7 @@
 
 #[cfg(not(test))]
 use default::Default;
+#[cfg(not(test))]
 use cmp::{Eq, Equal, Ord, Ordering, TotalEq, TotalOrd};
 
 #[cfg(not(test))]

branches/try2/src/libsyntax/ext/expand.rs

@@ -890,17 +890,15 @@ fn original_span(cx: &ExtCtxt) -> @codemap::ExpnInfo {
 mod test {
     use super::*;
     use ast;
-    use ast::{Attribute_, AttrOuter, MetaWord, EMPTY_CTXT};
-    use ast_util::{get_sctable, mtwt_marksof, mtwt_resolve, new_rename};
+    use ast::{Attribute_, AttrOuter, MetaWord};
+    use ast_util::{get_sctable, mtwt_marksof, mtwt_resolve};
     use ast_util;
     use codemap;
     use codemap::Spanned;
-    use fold::*;
     use ext::base::{CrateLoader, MacroCrate};
     use parse;
-    use parse::token::{fresh_mark, gensym, intern};
     use parse::token;
-    use util::parser_testing::{string_to_crate, string_to_crate_and_sess};
+    use util::parser_testing::{string_to_crate_and_sess};
     use util::parser_testing::{string_to_pat, strs_to_idents};
     use visit;
     use visit::Visitor;