Auto merge of #22920 - tshepang:remove-some-warnings, r=huonw

2 files changed, 3 insertions, 5 deletions

diff --git a/src/libcoretest/hash/mod.rs b/src/libcoretest/hash/mod.rs
index da96680d84b..3433813e7b5 100644
--- a/src/libcoretest/hash/mod.rs
+++ b/src/libcoretest/hash/mod.rs
@@ -86,7 +86,7 @@ struct CustomHasher { output: u64 }
 
 impl Hasher for CustomHasher {
     fn finish(&self) -> u64 { self.output }
-    fn write(&mut self, data: &[u8]) { panic!() }
+    fn write(&mut self, _: &[u8]) { panic!() }
     fn write_u64(&mut self, data: u64) { self.output = data; }
 }
 
diff --git a/src/libcoretest/str.rs b/src/libcoretest/str.rs
index 019f935911f..a89d3380707 100644
--- a/src/libcoretest/str.rs
+++ b/src/libcoretest/str.rs
@@ -188,15 +188,13 @@ fn trim_ws() {
 
 mod pattern {
     use std::str::Pattern;
-    use std::str::{Searcher, ReverseSearcher, DoubleEndedSearcher};
+    use std::str::{Searcher, ReverseSearcher};
     use std::str::SearchStep::{self, Match, Reject, Done};
 
     macro_rules! make_test {
         ($name:ident, $p:expr, $h:expr, [$($e:expr,)*]) => {
             mod $name {
-                use std::str::Pattern;
-                use std::str::{Searcher, ReverseSearcher, DoubleEndedSearcher};
-                use std::str::SearchStep::{self, Match, Reject, Done};
+                use std::str::SearchStep::{Match, Reject};
                 use super::{cmp_search_to_vec};
                 #[test]
                 fn fwd() {