auto merge of #19254 : nick29581/rust/dxr-glob, r=pcwalton

There is also some work here to make resolve a bit more stable - it no longer overwrites a specific import with a glob import.

r?

1 files changed, 1 insertions, 1 deletions

diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs
index 5feae5e558e..bccd2a1198a 100644
--- a/src/libcollections/str.rs
+++ b/src/libcollections/str.rs
@@ -3330,10 +3330,10 @@ mod tests {
 
 #[cfg(test)]
 mod bench {
+    use super::*;
     use prelude::*;
     use test::Bencher;
     use test::black_box;
-    use super::*;
 
     #[bench]
     fn char_iterator(b: &mut Bencher) {