edition: initial 'cargo fix --edition' run

crates/searcher/src/lib.rs

@@ -110,13 +110,13 @@ extern crate memmap;
 #[cfg(test)]
 extern crate regex;
 
-pub use lines::{LineIter, LineStep};
-pub use searcher::{
+pub use crate::lines::{LineIter, LineStep};
+pub use crate::searcher::{
     BinaryDetection, ConfigError, Encoding, MmapChoice, Searcher,
     SearcherBuilder,
 };
-pub use sink::sinks;
-pub use sink::{
+pub use crate::sink::sinks;
+pub use crate::sink::{
     Sink, SinkContext, SinkContextKind, SinkError, SinkFinish, SinkMatch,
 };
 

crates/searcher/src/searcher/core.rs

@@ -2,13 +2,13 @@ use std::cmp;
 
 use bstr::ByteSlice;
 
-use grep_matcher::{LineMatchKind, Matcher};
-use line_buffer::BinaryDetection;
-use lines::{self, LineStep};
-use searcher::{Config, Range, Searcher};
-use sink::{
+use crate::line_buffer::BinaryDetection;
+use crate::lines::{self, LineStep};
+use crate::searcher::{Config, Range, Searcher};
+use crate::sink::{
     Sink, SinkContext, SinkContextKind, SinkError, SinkFinish, SinkMatch,
 };
+use grep_matcher::{LineMatchKind, Matcher};
 
 #[derive(Debug)]
 pub struct Core<'s, M: 's, S> {

crates/searcher/src/searcher/glue.rs

@@ -1,13 +1,13 @@
 use std::cmp;
 use std::io;
 
+use crate::line_buffer::{LineBufferReader, DEFAULT_BUFFER_CAPACITY};
+use crate::lines::{self, LineStep};
+use crate::sink::{Sink, SinkError};
 use grep_matcher::Matcher;
-use line_buffer::{LineBufferReader, DEFAULT_BUFFER_CAPACITY};
-use lines::{self, LineStep};
-use sink::{Sink, SinkError};
 
-use searcher::core::Core;
-use searcher::{Config, Range, Searcher};
+use crate::searcher::core::Core;
+use crate::searcher::{Config, Range, Searcher};
 
 #[derive(Debug)]
 pub struct ReadByLine<'s, M: 's, R, S> {
@@ -349,8 +349,8 @@ impl<'s, M: Matcher, S: Sink> MultiLine<'s, M, S> {
 
 #[cfg(test)]
 mod tests {
-    use searcher::{BinaryDetection, SearcherBuilder};
-    use testutil::{KitchenSink, RegexMatcher, SearcherTester};
+    use crate::searcher::{BinaryDetection, SearcherBuilder};
+    use crate::testutil::{KitchenSink, RegexMatcher, SearcherTester};
 
     use super::*;
 
@@ -1488,8 +1488,8 @@ byte count:307
 
     #[test]
     fn scratch() {
-        use sinks;
-        use testutil::RegexMatcher;
+        use crate::sinks;
+        use crate::testutil::RegexMatcher;
 
         const SHERLOCK: &'static [u8] = b"\
 For the Doctor Wat\xFFsons of this world, as opposed to the Sherlock

crates/searcher/src/searcher/mod.rs

@@ -5,15 +5,15 @@ use std::fs::File;
 use std::io::{self, Read};
 use std::path::Path;
 
-use encoding_rs;
-use encoding_rs_io::DecodeReaderBytesBuilder;
-use grep_matcher::{LineTerminator, Match, Matcher};
-use line_buffer::{
+use crate::line_buffer::{
     self, alloc_error, BufferAllocation, LineBuffer, LineBufferBuilder,
     LineBufferReader, DEFAULT_BUFFER_CAPACITY,
 };
-use searcher::glue::{MultiLine, ReadByLine, SliceByLine};
-use sink::{Sink, SinkError};
+use crate::searcher::glue::{MultiLine, ReadByLine, SliceByLine};
+use crate::sink::{Sink, SinkError};
+use encoding_rs;
+use encoding_rs_io::DecodeReaderBytesBuilder;
+use grep_matcher::{LineTerminator, Match, Matcher};
 
 pub use self::mmap::MmapChoice;
 
@@ -990,7 +990,7 @@ fn slice_has_bom(slice: &[u8]) -> bool {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use testutil::{KitchenSink, RegexMatcher};
+    use crate::testutil::{KitchenSink, RegexMatcher};
 
     #[test]
     fn config_error_heap_limit() {

crates/searcher/src/sink.rs

@@ -4,8 +4,8 @@ use std::io;
 
 use grep_matcher::LineTerminator;
 
-use lines::LineIter;
-use searcher::{ConfigError, Searcher};
+use crate::lines::LineIter;
+use crate::searcher::{ConfigError, Searcher};
 
 /// A trait that describes errors that can be reported by searchers and
 /// implementations of `Sink`.
@@ -514,7 +514,7 @@ pub mod sinks {
     use std::str;
 
     use super::{Sink, SinkError, SinkMatch};
-    use searcher::Searcher;
+    use crate::searcher::Searcher;
 
     /// A sink that provides line numbers and matches as strings while ignoring
     /// everything else.

crates/searcher/src/testutil.rs

@@ -7,8 +7,8 @@ use grep_matcher::{
 };
 use regex::bytes::{Regex, RegexBuilder};
 
-use searcher::{BinaryDetection, Searcher, SearcherBuilder};
-use sink::{Sink, SinkContext, SinkFinish, SinkMatch};
+use crate::searcher::{BinaryDetection, Searcher, SearcherBuilder};
+use crate::sink::{Sink, SinkContext, SinkFinish, SinkMatch};
 
 /// A simple regex matcher.
 ///