diff options
Diffstat (limited to 'crates/regex')
-rw-r--r-- | crates/regex/src/config.rs | 14 | ||||
-rw-r--r-- | crates/regex/src/crlf.rs | 6 | ||||
-rw-r--r-- | crates/regex/src/error.rs | 2 | ||||
-rw-r--r-- | crates/regex/src/lib.rs | 4 | ||||
-rw-r--r-- | crates/regex/src/literal.rs | 2 | ||||
-rw-r--r-- | crates/regex/src/matcher.rs | 10 | ||||
-rw-r--r-- | crates/regex/src/multi.rs | 4 | ||||
-rw-r--r-- | crates/regex/src/strip.rs | 4 | ||||
-rw-r--r-- | crates/regex/src/word.rs | 8 |
9 files changed, 27 insertions, 27 deletions
diff --git a/crates/regex/src/config.rs b/crates/regex/src/config.rs index 6d2813ae..4f3cc0fd 100644 --- a/crates/regex/src/config.rs +++ b/crates/regex/src/config.rs @@ -3,13 +3,13 @@ use regex::bytes::{Regex, RegexBuilder}; use regex_syntax::ast::{self, Ast}; use regex_syntax::hir::{self, Hir}; -use ast::AstAnalysis; -use crlf::crlfify; -use error::Error; -use literal::LiteralSets; -use multi::alternation_literals; -use non_matching::non_matching_bytes; -use strip::strip_from_match; +use crate::ast::AstAnalysis; +use crate::crlf::crlfify; +use crate::error::Error; +use crate::literal::LiteralSets; +use crate::multi::alternation_literals; +use crate::non_matching::non_matching_bytes; +use crate::strip::strip_from_match; /// Config represents the configuration of a regex matcher in this crate. /// The configuration is itself a rough combination of the knobs found in diff --git a/crates/regex/src/crlf.rs b/crates/regex/src/crlf.rs index 09e78b9f..45492bdb 100644 --- a/crates/regex/src/crlf.rs +++ b/crates/regex/src/crlf.rs @@ -4,9 +4,9 @@ use grep_matcher::{Match, Matcher, NoError}; use regex::bytes::Regex; use regex_syntax::hir::{self, Hir, HirKind}; -use config::ConfiguredHIR; -use error::Error; -use matcher::RegexCaptures; +use crate::config::ConfiguredHIR; +use crate::error::Error; +use crate::matcher::RegexCaptures; /// A matcher for implementing "word match" semantics. #[derive(Clone, Debug)] diff --git a/crates/regex/src/error.rs b/crates/regex/src/error.rs index f3bf0825..6eba85ac 100644 --- a/crates/regex/src/error.rs +++ b/crates/regex/src/error.rs @@ -1,7 +1,7 @@ use std::error; use std::fmt; -use util; +use crate::util; /// An error that can occur in this crate. /// diff --git a/crates/regex/src/lib.rs b/crates/regex/src/lib.rs index 4004a692..36efa858 100644 --- a/crates/regex/src/lib.rs +++ b/crates/regex/src/lib.rs @@ -13,8 +13,8 @@ extern crate regex; extern crate regex_syntax; extern crate thread_local; -pub use error::{Error, ErrorKind}; -pub use matcher::{RegexCaptures, RegexMatcher, RegexMatcherBuilder}; +pub use crate::error::{Error, ErrorKind}; +pub use crate::matcher::{RegexCaptures, RegexMatcher, RegexMatcherBuilder}; mod ast; mod config; diff --git a/crates/regex/src/literal.rs b/crates/regex/src/literal.rs index 1828760e..7a6d92d9 100644 --- a/crates/regex/src/literal.rs +++ b/crates/regex/src/literal.rs @@ -9,7 +9,7 @@ use bstr::ByteSlice; use regex_syntax::hir::literal::{Literal, Literals}; use regex_syntax::hir::{self, Hir, HirKind}; -use util; +use crate::util; /// Represents prefix, suffix and inner "required" literals for a regular /// expression. diff --git a/crates/regex/src/matcher.rs b/crates/regex/src/matcher.rs index 3511e75b..cb7749c8 100644 --- a/crates/regex/src/matcher.rs +++ b/crates/regex/src/matcher.rs @@ -5,11 +5,11 @@ use grep_matcher::{ }; use regex::bytes::{CaptureLocations, Regex}; -use config::{Config, ConfiguredHIR}; -use crlf::CRLFMatcher; -use error::Error; -use multi::MultiLiteralMatcher; -use word::WordMatcher; +use crate::config::{Config, ConfiguredHIR}; +use crate::crlf::CRLFMatcher; +use crate::error::Error; +use crate::multi::MultiLiteralMatcher; +use crate::word::WordMatcher; /// A builder for constructing a `Matcher` using regular expressions. /// diff --git a/crates/regex/src/multi.rs b/crates/regex/src/multi.rs index ef4e62c2..d2d4af93 100644 --- a/crates/regex/src/multi.rs +++ b/crates/regex/src/multi.rs @@ -2,8 +2,8 @@ use aho_corasick::{AhoCorasick, AhoCorasickBuilder, MatchKind}; use grep_matcher::{Match, Matcher, NoError}; use regex_syntax::hir::Hir; -use error::Error; -use matcher::RegexCaptures; +use crate::error::Error; +use crate::matcher::RegexCaptures; /// A matcher for an alternation of literals. /// diff --git a/crates/regex/src/strip.rs b/crates/regex/src/strip.rs index 5322e5c9..f529f47c 100644 --- a/crates/regex/src/strip.rs +++ b/crates/regex/src/strip.rs @@ -1,7 +1,7 @@ use grep_matcher::LineTerminator; use regex_syntax::hir::{self, Hir, HirKind}; -use error::{Error, ErrorKind}; +use crate::error::{Error, ErrorKind}; /// Return an HIR that is guaranteed to never match the given line terminator, /// if possible. @@ -106,7 +106,7 @@ mod tests { use regex_syntax::Parser; use super::{strip_from_match, LineTerminator}; - use error::Error; + use crate::error::Error; fn roundtrip(pattern: &str, byte: u8) -> String { roundtrip_line_term(pattern, LineTerminator::byte(byte)).unwrap() diff --git a/crates/regex/src/word.rs b/crates/regex/src/word.rs index 1a75ba48..61b7e0f9 100644 --- a/crates/regex/src/word.rs +++ b/crates/regex/src/word.rs @@ -6,9 +6,9 @@ use grep_matcher::{Match, Matcher, NoError}; use regex::bytes::{CaptureLocations, Regex}; use thread_local::ThreadLocal; -use config::ConfiguredHIR; -use error::Error; -use matcher::RegexCaptures; +use crate::config::ConfiguredHIR; +use crate::error::Error; +use crate::matcher::RegexCaptures; /// A matcher for implementing "word match" semantics. #[derive(Debug)] @@ -184,7 +184,7 @@ impl Matcher for WordMatcher { #[cfg(test)] mod tests { use super::WordMatcher; - use config::Config; + use crate::config::Config; use grep_matcher::{Captures, Match, Matcher}; fn matcher(pattern: &str) -> WordMatcher { |