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> {
2424 . from_reader ( reader) ;
2525
2626 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 {
3029 reqs. push ( RequestRuleMatch {
3130 url : record. url . trim_matches ( '"' ) . to_owned ( ) ,
3231 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() {
7474
7575 let request_res = Request :: new ( & req. url , & req. sourceUrl , & req. r#type ) ;
7676 // 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 {
7978 assert ! (
8079 network_filter. matches( & request, & mut RegexManager :: default ( ) ) ,
8180 "Expected {} to match {} at {}, typed {}" ,
@@ -104,8 +103,8 @@ fn check_engine_matching() {
104103 }
105104 for filter in req. filters {
106105 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) ) ;
109108 engine. use_resources ( resources) ;
110109
111110 let network_filter_res = NetworkFilter :: parse ( & filter, true , opts) ;
You can’t perform that action at this time.
0 commit comments