Fix the rest clippy issues (#484)

* Fix the rest clippy issues
* revert changing CbRuleEquivalent

Author: atuchin-m

Cargo.toml

@@ -104,11 +104,6 @@ resource-assembler = []
 
 [lints.clippy]
 len_zero = "allow"
-# Temporary disabled until the code isn't fixed:
-sliced-string-as-bytes = "allow"
-or-then-unwrap = "allow"
-large-enum-variant = "allow"
-search-is-some = "allow"
 
 [workspace]
 members = ["js", "fuzz"]

benches/bench_redirect_performance.rs

@@ -194,8 +194,7 @@ pub fn build_custom_requests(rules: Vec<NetworkFilter>) -> Vec<Request> {
                 let domain_end = from_start
                     .find('|')
                     .or_else(|| from_start.find(","))
-                    .or(Some(from_start.len()))
-                    .unwrap()
+                    .unwrap_or(from_start.len())
                     + domain_start;
 
                 &raw_line[domain_start..domain_end]

src/blocker.rs

@@ -274,7 +274,7 @@ impl Blocker {
             // String indexing safety: indices come from `.len()` or `find_char` on individual ASCII
             // characters (1 byte each), some plus 1.
             let params_start = i + 1;
-            let hash_index = if let Some(j) = find_char(b'#', url[params_start..].as_bytes()) {
+            let hash_index = if let Some(j) = find_char(b'#', &url.as_bytes()[params_start..]) {
                 params_start + j
             } else {
                 url.len()

src/content_blocking.rs

@@ -253,6 +253,7 @@ fn non_empty(v: Vec<String>) -> Option<Vec<String>> {
 /// into multiple rules.
 ///
 /// The contained rules can be accessed using `IntoIterator`.
+#[allow(clippy::large_enum_variant)]
 pub enum CbRuleEquivalent {
     /// In most successful cases, an ABP rule can be converted into a single content blocking rule.
     SingleRule(CbRule),

src/filters/cosmetic.rs

@@ -365,7 +365,7 @@ impl CosmeticFilter {
         if let Some(sharp_index) = find_char(b'#', line.as_bytes()) {
             let after_sharp_index = sharp_index + 1;
 
-            let second_sharp_index = match find_char(b'#', line[after_sharp_index..].as_bytes()) {
+            let second_sharp_index = match find_char(b'#', &line.as_bytes()[after_sharp_index..]) {
                 Some(i) => i + after_sharp_index,
                 None => return Err(CosmeticFilterError::UnsupportedSyntax),
             };
@@ -548,7 +548,7 @@ fn get_hashes_from_labels(hostname: &str, end: usize, start_of_domain: usize) ->
     }
     let mut dot_ptr = start_of_domain;
 
-    while let Some(dot_index) = find_char_reverse(b'.', hostname[..dot_ptr].as_bytes()) {
+    while let Some(dot_index) = find_char_reverse(b'.', &hostname.as_bytes()[..dot_ptr]) {
         dot_ptr = dot_index;
         hashes.push(crate::utils::fast_hash(&hostname[dot_ptr + 1..end]));
     }

src/filters/network.rs

@@ -828,7 +828,7 @@ impl NetworkFilter {
 
         // This shouldn't be used to block an entire TLD, and the hostname shouldn't end with a dot
         if find_char(b'.', hostname.as_bytes()).is_none()
-            || (hostname.starts_with('.') && find_char(b'.', hostname[1..].as_bytes()).is_none())
+            || (hostname.starts_with('.') && find_char(b'.', &hostname.as_bytes()[1..]).is_none())
             || hostname.ends_with('.')
         {
             return Err(NetworkFilterError::FilterParseError);

tests/unit/resources/resource_assembler.rs

@@ -59,16 +59,13 @@ mod tests {
         for name in expected_resource_names {
             dbg!(&name);
             assert!(
-                resources
-                    .iter()
-                    .find(|resource| {
-                        if let ResourceType::Mime(_) = resource.kind {
-                            resource.name == name
-                        } else {
-                            false
-                        }
-                    })
-                    .is_some(),
+                resources.iter().any(|resource| {
+                    if let ResourceType::Mime(_) = resource.kind {
+                        resource.name == name
+                    } else {
+                        false
+                    }
+                }),
                 "{:?}",
                 name
             );
@@ -152,18 +149,15 @@ mod tests {
 
         for name in expected_resource_names {
             assert!(
-                resources
-                    .iter()
-                    .find(|resource| {
-                        match resource.kind {
-                            ResourceType::Template
-                            | ResourceType::Mime(MimeType::ApplicationJavascript) => {
-                                resource.name == name
-                            }
-                            _ => false,
+                resources.iter().any(|resource| {
+                    match resource.kind {
+                        ResourceType::Template
+                        | ResourceType::Mime(MimeType::ApplicationJavascript) => {
+                            resource.name == name
                         }
-                    })
-                    .is_some(),
+                        _ => false,
+                    }
+                }),
                 "failed to find {}",
                 name
             );
@@ -251,18 +245,15 @@ mod tests {
 
         for name in expected_resource_names {
             assert!(
-                resources
-                    .iter()
-                    .find(|resource| {
-                        match resource.kind {
-                            ResourceType::Template
-                            | ResourceType::Mime(MimeType::ApplicationJavascript) => {
-                                resource.name == name
-                            }
-                            _ => false,
+                resources.iter().any(|resource| {
+                    match resource.kind {
+                        ResourceType::Template
+                        | ResourceType::Mime(MimeType::ApplicationJavascript) => {
+                            resource.name == name
                         }
-                    })
-                    .is_some(),
+                        _ => false,
+                    }
+                }),
                 "failed to find {}",
                 name
             );