From 0bc2c64a538b3a00956cfb5e2231fc1efaab656b Mon Sep 17 00:00:00 2001
From: Paul Masurel <paul.masurel@gmail.com>
Date: Sun, 7 Jul 2019 17:09:04 +0900
Subject: [PATCH] 2018 (#585)

* removing macro import for fail-rs

* Downcast-rs

* matches
---
 src/collector/mod.rs                   |  2 +-
 src/collector/top_field_collector.rs   |  1 +
 src/core/segment_reader.rs             |  1 +
 src/directory/ram_directory.rs         |  1 +
 src/lib.rs                             | 25 -------------------------
 src/query/query.rs                     |  3 ++-
 src/query/query_parser/query_parser.rs |  1 +
 src/query/scorer.rs                    |  2 +-
 src/schema/schema.rs                   |  1 +
 src/snippet/mod.rs                     |  1 +
 10 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/src/collector/mod.rs b/src/collector/mod.rs
index e6ceb6a05..c2ae35bba 100644
--- a/src/collector/mod.rs
+++ b/src/collector/mod.rs
@@ -90,7 +90,7 @@ use crate::Result;
 use crate::Score;
 use crate::SegmentLocalId;
 use crate::SegmentReader;
-use downcast_rs;
+use downcast_rs::impl_downcast;
 
 mod count_collector;
 pub use self::count_collector::Count;
diff --git a/src/collector/top_field_collector.rs b/src/collector/top_field_collector.rs
index d679d0122..9a91d9e73 100644
--- a/src/collector/top_field_collector.rs
+++ b/src/collector/top_field_collector.rs
@@ -170,6 +170,7 @@ mod tests {
     use crate::Index;
     use crate::IndexWriter;
     use crate::TantivyError;
+    use matches::assert_matches;
 
     const TITLE: &str = "title";
     const SIZE: &str = "size";
diff --git a/src/core/segment_reader.rs b/src/core/segment_reader.rs
index 7c89c691f..d10c15fa0 100644
--- a/src/core/segment_reader.rs
+++ b/src/core/segment_reader.rs
@@ -17,6 +17,7 @@ use crate::store::StoreReader;
 use crate::termdict::TermDictionary;
 use crate::DocId;
 use crate::Result;
+use fail::fail_point;
 use std::collections::HashMap;
 use std::fmt;
 use std::sync::Arc;
diff --git a/src/directory/ram_directory.rs b/src/directory/ram_directory.rs
index cef5462da..0ddf50f53 100644
--- a/src/directory/ram_directory.rs
+++ b/src/directory/ram_directory.rs
@@ -3,6 +3,7 @@ use crate::directory::error::{DeleteError, OpenReadError, OpenWriteError};
 use crate::directory::WatchCallbackList;
 use crate::directory::WritePtr;
 use crate::directory::{Directory, ReadOnlySource, WatchCallback, WatchHandle};
+use fail::fail_point;
 use std::collections::HashMap;
 use std::fmt;
 use std::io::{self, BufWriter, Cursor, Seek, SeekFrom, Write};
diff --git a/src/lib.rs b/src/lib.rs
index 8a3e299f4..ebae6e1f0 100755
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -123,34 +123,9 @@ extern crate log;
 #[macro_use]
 extern crate failure;
 
-#[cfg(feature = "mmap")]
-extern crate atomicwrites;
-#[cfg(feature = "mmap")]
-extern crate memmap;
-
-#[cfg(test)]
-#[macro_use]
-extern crate matches;
-
-#[cfg(windows)]
-extern crate winapi;
-
-#[cfg(test)]
-extern crate rand;
-
-#[cfg(test)]
-#[macro_use]
-extern crate maplit;
-
 #[cfg(all(test, feature = "unstable"))]
 extern crate test;
 
-#[macro_use]
-extern crate downcast_rs;
-
-#[macro_use]
-extern crate fail;
-
 #[cfg(feature = "mmap")]
 #[cfg(test)]
 mod functional_test;
diff --git a/src/query/query.rs b/src/query/query.rs
index caa2a974a..4b7c89b89 100644
--- a/src/query/query.rs
+++ b/src/query/query.rs
@@ -1,9 +1,10 @@
 use super::Weight;
 use crate::core::searcher::Searcher;
 use crate::query::Explanation;
+use crate::DocAddress;
 use crate::Result;
 use crate::Term;
-use crate::{downcast_rs, DocAddress};
+use downcast_rs::impl_downcast;
 use std::collections::BTreeSet;
 use std::fmt;
 
diff --git a/src/query/query_parser/query_parser.rs b/src/query/query_parser/query_parser.rs
index eb35a4464..bef73ca8e 100644
--- a/src/query/query_parser/query_parser.rs
+++ b/src/query/query_parser/query_parser.rs
@@ -509,6 +509,7 @@ mod test {
         LowerCaser, SimpleTokenizer, StopWordFilter, Tokenizer, TokenizerManager,
     };
     use crate::Index;
+    use matches::assert_matches;
 
     fn make_query_parser() -> QueryParser {
         let mut schema_builder = Schema::builder();
diff --git a/src/query/scorer.rs b/src/query/scorer.rs
index 2dbae69bb..a67d4c634 100644
--- a/src/query/scorer.rs
+++ b/src/query/scorer.rs
@@ -2,7 +2,7 @@ use crate::common::BitSet;
 use crate::docset::{DocSet, SkipResult};
 use crate::DocId;
 use crate::Score;
-use downcast_rs;
+use downcast_rs::impl_downcast;
 use std::ops::DerefMut;
 
 /// Scored set of documents matching a query within a specific segment.
diff --git a/src/schema/schema.rs b/src/schema/schema.rs
index 781acf5e5..811212afb 100644
--- a/src/schema/schema.rs
+++ b/src/schema/schema.rs
@@ -356,6 +356,7 @@ mod tests {
     use crate::schema::field_type::ValueParsingError;
     use crate::schema::schema::DocParsingError::NotJSON;
     use crate::schema::*;
+    use matches::{assert_matches, matches};
     use serde_json;
 
     #[test]
diff --git a/src/snippet/mod.rs b/src/snippet/mod.rs
index 1b1a08012..fddeccee6 100644
--- a/src/snippet/mod.rs
+++ b/src/snippet/mod.rs
@@ -334,6 +334,7 @@ mod tests {
     use crate::tokenizer::{box_tokenizer, SimpleTokenizer};
     use crate::Index;
     use crate::SnippetGenerator;
+    use maplit::btreemap;
     use std::collections::BTreeMap;
     use std::iter::Iterator;