From d5b2557da56090e6df767fb6b68dc32f60030802 Mon Sep 17 00:00:00 2001
From: Henry Schimke <henry@azule.info>
Date: Sat, 4 Feb 2023 13:14:22 -0600
Subject: [PATCH] clippy --fx

---
 src/client/result/BookmarkDoCoMoResultParser.rs |  2 +-
 src/client/result/WifiResultParser.rs           | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/client/result/BookmarkDoCoMoResultParser.rs b/src/client/result/BookmarkDoCoMoResultParser.rs
index 8c077b9..3ad6d3e 100644
--- a/src/client/result/BookmarkDoCoMoResultParser.rs
+++ b/src/client/result/BookmarkDoCoMoResultParser.rs
@@ -37,7 +37,7 @@ pub fn parse(result: &RXingResult) -> Option<ParsedClientResult> {
     if URIResultParser::is_basically_valid_uri(&uri) {
         Some(ParsedClientResult::URIResult(URIParsedRXingResult::new(
             uri,
-            title.unwrap_or_else(|| String::default()),
+            title.unwrap_or_default(),
         )))
     } else {
         None
diff --git a/src/client/result/WifiResultParser.rs b/src/client/result/WifiResultParser.rs
index 3d55a1c..4c89a57 100644
--- a/src/client/result/WifiResultParser.rs
+++ b/src/client/result/WifiResultParser.rs
@@ -51,13 +51,11 @@ pub fn parse(theRXingResult: &crate::RXingResult) -> Option<super::ParsedClientR
         return None;
     }
     let rawText = rawText_unstripped[WIFI_TEST.len()..].to_owned();
-    let ssid = ResultParser::matchSinglePrefixedField("S:", &rawText, ';', false)
-        .unwrap_or_else(|| String::default());
+    let ssid = ResultParser::matchSinglePrefixedField("S:", &rawText, ';', false).unwrap_or_default();
     if ssid.is_empty() {
         return None;
     }
-    let pass = ResultParser::matchSinglePrefixedField("P:", &rawText, ';', false)
-        .unwrap_or_else(|| String::default());
+    let pass = ResultParser::matchSinglePrefixedField("P:", &rawText, ';', false).unwrap_or_default();
     let n_type =
         if let Some(nt) = ResultParser::matchSinglePrefixedField("T:", &rawText, ';', false) {
             nt
@@ -84,12 +82,9 @@ pub fn parse(theRXingResult: &crate::RXingResult) -> Option<super::ParsedClientR
         String::default()
     };
 
-    let identity = ResultParser::matchSinglePrefixedField("I:", &rawText, ';', false)
-        .unwrap_or_else(|| String::default());
-    let anonymousIdentity = ResultParser::matchSinglePrefixedField("A:", &rawText, ';', false)
-        .unwrap_or_else(|| String::default());
-    let eapMethod = ResultParser::matchSinglePrefixedField("E:", &rawText, ';', false)
-        .unwrap_or_else(|| String::default());
+    let identity = ResultParser::matchSinglePrefixedField("I:", &rawText, ';', false).unwrap_or_default();
+    let anonymousIdentity = ResultParser::matchSinglePrefixedField("A:", &rawText, ';', false).unwrap_or_default();
+    let eapMethod = ResultParser::matchSinglePrefixedField("E:", &rawText, ';', false).unwrap_or_default();
 
     Some(ParsedClientResult::WiFiResult(
         WifiParsedRXingResult::with_details(
@@ -100,7 +95,7 @@ pub fn parse(theRXingResult: &crate::RXingResult) -> Option<super::ParsedClientR
             identity,
             anonymousIdentity,
             eapMethod,
-            phase2Method.unwrap_or_else(|| String::default()),
+            phase2Method.unwrap_or_default(),
         ),
     ))
 }