ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-26 04:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

clippy --fx

Browse Source
This commit is contained in:
Henry Schimke
2023-02-04 13:14:22 -06:00
parent 9d01d43e1a
commit d5b2557da5
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/result/BookmarkDoCoMoResultParser.rs
View File

@@ -37,7 +37,7 @@ pub fn parse(result: &RXingResult) -> Option<ParsedClientResult> {
if URIResultParser::is_basically_valid_uri(&uri) { if URIResultParser::is_basically_valid_uri(&uri) {
Some(ParsedClientResult::URIResult(URIParsedRXingResult::new( Some(ParsedClientResult::URIResult(URIParsedRXingResult::new(
uri, uri,
title.unwrap_or_else(|| String::default()), title.unwrap_or_default(),
))) )))
} else { } else {
None None

17
src/client/result/WifiResultParser.rs
View File

@@ -51,13 +51,11 @@ pub fn parse(theRXingResult: &crate::RXingResult) -> Option<super::ParsedClientR
return None; return None;
} }
let rawText = rawText_unstripped[WIFI_TEST.len()..].to_owned(); let rawText = rawText_unstripped[WIFI_TEST.len()..].to_owned();
let ssid = ResultParser::matchSinglePrefixedField("S:", &rawText, ';', false) let ssid = ResultParser::matchSinglePrefixedField("S:", &rawText, ';', false).unwrap_or_default();
.unwrap_or_else(|| String::default());
if ssid.is_empty() { if ssid.is_empty() {
return None; return None;
} }
let pass = ResultParser::matchSinglePrefixedField("P:", &rawText, ';', false) let pass = ResultParser::matchSinglePrefixedField("P:", &rawText, ';', false).unwrap_or_default();
.unwrap_or_else(|| String::default());
let n_type = let n_type =
if let Some(nt) = ResultParser::matchSinglePrefixedField("T:", &rawText, ';', false) { if let Some(nt) = ResultParser::matchSinglePrefixedField("T:", &rawText, ';', false) {
nt nt
@@ -84,12 +82,9 @@ pub fn parse(theRXingResult: &crate::RXingResult) -> Option<super::ParsedClientR
String::default() String::default()
}; };
let identity = ResultParser::matchSinglePrefixedField("I:", &rawText, ';', false) let identity = ResultParser::matchSinglePrefixedField("I:", &rawText, ';', false).unwrap_or_default();
.unwrap_or_else(|| String::default()); let anonymousIdentity = ResultParser::matchSinglePrefixedField("A:", &rawText, ';', false).unwrap_or_default();
let anonymousIdentity = ResultParser::matchSinglePrefixedField("A:", &rawText, ';', false) let eapMethod = ResultParser::matchSinglePrefixedField("E:", &rawText, ';', false).unwrap_or_default();
.unwrap_or_else(|| String::default());
let eapMethod = ResultParser::matchSinglePrefixedField("E:", &rawText, ';', false)
.unwrap_or_else(|| String::default());
Some(ParsedClientResult::WiFiResult( Some(ParsedClientResult::WiFiResult(
WifiParsedRXingResult::with_details( WifiParsedRXingResult::with_details(
@@ -100,7 +95,7 @@ pub fn parse(theRXingResult: &crate::RXingResult) -> Option<super::ParsedClientR
identity, identity,
anonymousIdentity, anonymousIdentity,
eapMethod, eapMethod,
phase2Method.unwrap_or_else(|| String::default()), phase2Method.unwrap_or_default(),
), ),
)) ))
} }