deps: update to aho-corasick 0.7

We do the simplest possible change to migrate to the new version. Fixes #1228
BurntSushi · Apr 3, 2019 · cd9815c · cd9815c
1 parent 3f22c3a
commit cd9815c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 28 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/globset/Cargo.toml b/globset/Cargo.toml
@@ -19,7 +19,7 @@ name = "globset"
 bench = false
 
 [dependencies]
-aho-corasick = "0.6.8"
+aho-corasick = "0.7.3"
 fnv = "1.0.6"
 log = "0.4.5"
 memchr = "2.1.0"

diff --git a/globset/src/lib.rs b/globset/src/lib.rs
@@ -119,7 +119,7 @@ use std::hash;
 use std::path::Path;
 use std::str;
 
-use aho_corasick::{Automaton, AcAutomaton, FullAcAutomaton};
+use aho_corasick::AhoCorasick;
 use regex::bytes::{Regex, RegexBuilder, RegexSet};
 
 use pathutil::{
@@ -648,16 +648,16 @@ impl ExtensionStrategy {
 
 #[derive(Clone, Debug)]
 struct PrefixStrategy {
-    matcher: FullAcAutomaton<Vec<u8>>,
+    matcher: AhoCorasick,
     map: Vec<usize>,
     longest: usize,
 }
 
 impl PrefixStrategy {
     fn is_match(&self, candidate: &Candidate) -> bool {
         let path = candidate.path_prefix(self.longest);
-        for m in self.matcher.find_overlapping(path) {
-            if m.start == 0 {
+        for m in self.matcher.find_overlapping_iter(path) {
+            if m.start() == 0 {
                 return true;
             }
         }
@@ -666,26 +666,26 @@ impl PrefixStrategy {
 
     fn matches_into(&self, candidate: &Candidate, matches: &mut Vec<usize>) {
         let path = candidate.path_prefix(self.longest);
-        for m in self.matcher.find_overlapping(path) {
-            if m.start == 0 {
-                matches.push(self.map[m.pati]);
+        for m in self.matcher.find_overlapping_iter(path) {
+            if m.start() == 0 {
+                matches.push(self.map[m.pattern()]);
             }
         }
     }
 }
 
 #[derive(Clone, Debug)]
 struct SuffixStrategy {
-    matcher: FullAcAutomaton<Vec<u8>>,
+    matcher: AhoCorasick,
     map: Vec<usize>,
     longest: usize,
 }
 
 impl SuffixStrategy {
     fn is_match(&self, candidate: &Candidate) -> bool {
         let path = candidate.path_suffix(self.longest);
-        for m in self.matcher.find_overlapping(path) {
-            if m.end == path.len() {
+        for m in self.matcher.find_overlapping_iter(path) {
+            if m.end() == path.len() {
                 return true;
             }
         }
@@ -694,9 +694,9 @@ impl SuffixStrategy {
 
     fn matches_into(&self, candidate: &Candidate, matches: &mut Vec<usize>) {
         let path = candidate.path_suffix(self.longest);
-        for m in self.matcher.find_overlapping(path) {
-            if m.end == path.len() {
-                matches.push(self.map[m.pati]);
+        for m in self.matcher.find_overlapping_iter(path) {
+            if m.end() == path.len() {
+                matches.push(self.map[m.pattern()]);
             }
         }
     }
@@ -781,18 +781,16 @@ impl MultiStrategyBuilder {
     }
 
     fn prefix(self) -> PrefixStrategy {
-        let it = self.literals.into_iter().map(|s| s.into_bytes());
         PrefixStrategy {
-            matcher: AcAutomaton::new(it).into_full(),
+            matcher: AhoCorasick::new_auto_configured(&self.literals),
             map: self.map,
             longest: self.longest,
         }
     }
 
     fn suffix(self) -> SuffixStrategy {
-        let it = self.literals.into_iter().map(|s| s.into_bytes());
         SuffixStrategy {
-            matcher: AcAutomaton::new(it).into_full(),
+            matcher: AhoCorasick::new_auto_configured(&self.literals),
             map: self.map,
             longest: self.longest,
         }