File tree Expand file tree Collapse file tree 2 files changed +5
-7
lines changed Expand file tree Collapse file tree 2 files changed +5
-7
lines changed Original file line number Diff line number Diff line change @@ -24,9 +24,8 @@ fn load_requests() -> Vec<RequestRuleMatch> {
24
24
. from_reader ( reader) ;
25
25
26
26
let mut reqs: Vec < RequestRuleMatch > = Vec :: new ( ) ;
27
- for result in rdr. deserialize ( ) {
28
- if result. is_ok ( ) {
29
- let record: RequestRuleMatch = result. unwrap ( ) ;
27
+ for result in rdr. deserialize :: < RequestRuleMatch > ( ) {
28
+ if let Ok ( record) = result {
30
29
reqs. push ( RequestRuleMatch {
31
30
url : record. url . trim_matches ( '"' ) . to_owned ( ) ,
32
31
sourceUrl : record. sourceUrl . trim_matches ( '"' ) . to_owned ( ) ,
Original file line number Diff line number Diff line change @@ -74,8 +74,7 @@ fn check_filter_matching() {
74
74
75
75
let request_res = Request :: new ( & req. url , & req. sourceUrl , & req. r#type ) ;
76
76
// The dataset has cases where URL is set to just "http://" or "https://", which we do not support
77
- if request_res. is_ok ( ) {
78
- let request = request_res. unwrap ( ) ;
77
+ if let Ok ( request) = request_res {
79
78
assert ! (
80
79
network_filter. matches( & request, & mut RegexManager :: default ( ) ) ,
81
80
"Expected {} to match {} at {}, typed {}" ,
@@ -104,8 +103,8 @@ fn check_engine_matching() {
104
103
}
105
104
for filter in req. filters {
106
105
let opts = ParseOptions :: default ( ) ;
107
- let mut engine = Engine :: from_rules_debug ( & [ filter. clone ( ) ] , opts) ;
108
- let resources = build_resources_from_filters ( & [ filter. clone ( ) ] ) ;
106
+ let mut engine = Engine :: from_rules_debug ( std :: slice :: from_ref ( & filter) , opts) ;
107
+ let resources = build_resources_from_filters ( std :: slice :: from_ref ( & filter) ) ;
109
108
engine. use_resources ( resources) ;
110
109
111
110
let network_filter_res = NetworkFilter :: parse ( & filter, true , opts) ;
You can’t perform that action at this time.
0 commit comments