Compilation & cherry-pick fixes.

Author: boocmp

src/filters/abstract_network.rs

@@ -1,4 +1,4 @@
-use memchr::memchr as find_char;
+use memchr::memrchr as find_char_reverse;
 
 use super::network::NetworkFilterError;
 
@@ -105,7 +105,7 @@ impl AbstractNetworkFilter {
             exception = true;
         }
 
-        let maybe_options_index: Option<usize> = find_char(b'$', line.as_bytes());
+        let maybe_options_index: Option<usize> = find_char_reverse(b'$', line.as_bytes());
 
         let mut options = None;
         if let Some(options_index) = maybe_options_index {

tests/unit/optimizer.rs

@@ -3,9 +3,9 @@ mod optimization_tests_pattern_group {
     #[cfg(test)]
     mod optimization_tests_pattern_group {
         use super::*;
-        use crate::filters::network::CompiledRegex;
         use crate::filters::network::NetworkMatchable;
         use crate::lists;
+        use crate::regex_manager::CompiledRegex;
         use crate::regex_manager::RegexManager;
         use crate::request::Request;
         use regex::bytes::RegexSetBuilder as BytesRegexSetBuilder;
@@ -331,9 +331,9 @@ mod optimization_tests_pattern_group {
     }
     */
     use super::super::*;
-    use crate::filters::network::CompiledRegex;
     use crate::filters::network::NetworkMatchable;
     use crate::lists;
+    use crate::regex_manager::CompiledRegex;
     use crate::regex_manager::RegexManager;
     use crate::request::Request;
     use regex::bytes::RegexSetBuilder as BytesRegexSetBuilder;