From aeadefa69d6a2145f7bdd7328c40b1b07db2dd4d Mon Sep 17 00:00:00 2001
From: Eric Scouten <scouten@adobe.com>
Date: Wed, 19 Feb 2025 09:54:41 -0800
Subject: [PATCH] Fix new Clippy issues

---
 sdk/src/assertion.rs             |  5 +----
 sdk/src/manifest_store.rs        |  2 +-
 sdk/src/manifest_store_report.rs |  2 +-
 sdk/src/settings.rs              | 11 +++--------
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/sdk/src/assertion.rs b/sdk/src/assertion.rs
index 66e15ec23..53dee19e3 100644
--- a/sdk/src/assertion.rs
+++ b/sdk/src/assertion.rs
@@ -86,10 +86,7 @@ pub fn get_thumbnail_instance(label: &str) -> Option<usize> {
             let components: Vec<&str> = label.split("__").collect();
             if components.len() == 2 {
                 let subparts: Vec<&str> = components[1].split('.').collect();
-                match subparts[0].parse::<usize>() {
-                    Ok(i) => Some(i),
-                    Err(_e) => None,
-                }
+                subparts[0].parse::<usize>().ok()
             } else {
                 Some(0)
             }
diff --git a/sdk/src/manifest_store.rs b/sdk/src/manifest_store.rs
index cd86be18b..b76a32db1 100644
--- a/sdk/src/manifest_store.rs
+++ b/sdk/src/manifest_store.rs
@@ -572,7 +572,7 @@ impl std::fmt::Display for ManifestStore {
                     let idx3 = json[index..].find('[').unwrap_or_default();
 
                     let bytes: Vec<u8> =
-                        serde_json::from_slice(json[index + idx3..index + idx2 + 1].as_bytes())
+                        serde_json::from_slice(&json.as_bytes()[index + idx3..index + idx2 + 1])
                             .unwrap_or_default();
 
                     json = format!(
diff --git a/sdk/src/manifest_store_report.rs b/sdk/src/manifest_store_report.rs
index 5eb27e374..53b54f2a8 100644
--- a/sdk/src/manifest_store_report.rs
+++ b/sdk/src/manifest_store_report.rs
@@ -419,7 +419,7 @@ fn b64_tag(mut json: String, tag: &str) -> String {
         if let Some(idx2) = json[index..].find(']') {
             let idx3 = json[index..].find('[').unwrap_or_default(); // ok since we just found it
             let bytes: Vec<u8> =
-                serde_json::from_slice(json[index + idx3..index + idx2 + 1].as_bytes())
+                serde_json::from_slice(&json.as_bytes()[index + idx3..index + idx2 + 1])
                     .unwrap_or_default();
             json = format!(
                 "{}\"{}\": \"{}\"{}",
diff --git a/sdk/src/settings.rs b/sdk/src/settings.rs
index df30a8b7a..4321fb8e3 100644
--- a/sdk/src/settings.rs
+++ b/sdk/src/settings.rs
@@ -293,14 +293,9 @@ pub(crate) fn get_settings() -> Option<Settings> {
             let source = c.clone(); // clone required since deserialize consumes object
             let cloned_config = Config::builder().add_source(source).build();
 
-            if let Ok(cloned_config) = cloned_config {
-                match cloned_config.try_deserialize::<Settings>() {
-                    Ok(s) => Some(s),
-                    Err(_) => None,
-                }
-            } else {
-                None
-            }
+            cloned_config
+                .ok()
+                .and_then(|s| s.try_deserialize::<Settings>().ok())
         }
         Err(_) => None,
     }