---

yaml
---
r: 97947
b: refs/heads/master
c: 0547fb9
h: refs/heads/master
i:
  97945: 7722c59
  97943: c22801b
v: v3

Author: alexcrichton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f47e4b2874a69491e9d06e4fdbd7de4cb907b52e
+refs/heads/master: 0547fb9cad4053f3ec66e722b7a05df259d63038
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: b6400f998497c3958f40997a71756ead344a776d
 refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36

trunk/src/librustc/driver/driver.rs

@@ -1131,6 +1131,7 @@ mod test {
 
     use extra::getopts::groups::getopts;
     use syntax::attr;
+    use syntax::attr::AttrMetaMethods;
     use syntax::diagnostic;
 
     // When the user supplies --test we should implicitly supply --cfg test

trunk/src/librustc/util/sha2.rs

@@ -522,7 +522,7 @@ static H256: [u32, ..8] = [
 
 #[cfg(test)]
 mod tests {
-    use super::{Digest, Sha256};
+    use super::{Digest, Sha256, FixedBuffer};
     use std::vec;
     use std::rand::isaac::IsaacRng;
     use std::rand::Rng;
@@ -633,7 +633,7 @@ mod tests {
 #[cfg(test)]
 mod bench {
     use extra::test::BenchHarness;
-    use super::Sha256;
+    use super::{Sha256, FixedBuffer, Digest};
 
     #[bench]
     pub fn sha256_10(bh: &mut BenchHarness) {

trunk/src/librustpkg/tests.rs

@@ -10,6 +10,7 @@
 
 // rustpkg unit tests
 
+use CtxMethods;
 use context::{BuildContext, Context, RustcFlags};
 use std::{os, run, str, task};
 use std::io;

trunk/src/librustuv/async.rs

@@ -125,7 +125,7 @@ impl Drop for AsyncWatcher {
 
 #[cfg(test)]
 mod test_remote {
-    use std::rt::rtio::Callback;
+    use std::rt::rtio::{Callback, RemoteCallback};
     use std::rt::thread::Thread;
 
     use super::AsyncWatcher;

trunk/src/libstd/rt/args.rs

@@ -140,7 +140,7 @@ mod imp {
 
     #[cfg(test)]
     mod tests {
-        use option::{Some, None};
+        use prelude::*;
         use super::*;
         use unstable::finally::Finally;
 

trunk/src/libstd/rt/logging.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 use container::Container;
-use fmt;
 use from_str::from_str;
 use iter::Iterator;
 use libc::exit;

trunk/src/libsyntax/ext/expand.rs

@@ -1109,6 +1109,7 @@ mod test {
     use codemap;
     use codemap::Spanned;
     use fold;
+    use fold::*;
     use parse;
     use parse::token::{fresh_mark, gensym, intern, ident_to_str};
     use parse::token;