From 92f15be032e827e616c3194dcfed706c6f968161 Mon Sep 17 00:00:00 2001 From: Henry Schimke Date: Sat, 4 Feb 2023 13:13:05 -0600 Subject: [PATCH] standardize empty string to String::default() This replaces "".to_owned() "".to_string() and String::from("") --- .../result/AddressBookAUResultParser.rs | 10 +++--- .../result/AddressBookDoCoMoResultParser.rs | 6 ++-- src/client/result/AddressBookParsedResult.rs | 12 +++---- src/client/result/BizcardResultParser.rs | 8 ++--- .../result/BookmarkDoCoMoResultParser.rs | 2 +- src/client/result/CalendarParsedResult.rs | 4 +-- .../result/CalendarParsedResultTestCase.rs | 4 +-- src/client/result/EmailAddressParsedResult.rs | 4 +-- src/client/result/EmailAddressResultParser.rs | 8 ++--- .../result/ExpandedProductResultParser.rs | 26 +++++++------- .../result/ParsedReaderResultTestCase.rs | 4 +-- src/client/result/ResultParser.rs | 4 +-- src/client/result/SMSMMSResultParser.rs | 10 +++--- src/client/result/SMSTOMMSTOResultParser.rs | 4 +-- src/client/result/TelResultParser.rs | 2 +- src/client/result/URIResultParser.rs | 4 +-- src/client/result/VCardResultParser.rs | 34 ++++++++----------- src/client/result/VEventResultParser.rs | 12 +++---- src/client/result/WifiParsedResult.rs | 8 ++--- src/client/result/WifiResultParser.rs | 14 ++++---- .../rss/expanded/decoders/field_parser.rs | 2 +- .../decoders/general_app_id_decoder.rs | 4 +-- .../rss_expanded_image_2_result_test_case.rs | 18 +++++----- .../decoder/pdf_417_decoder_test_case.rs | 2 +- tests/common/abstract_black_box_test_case.rs | 2 +- tests/common/pdf_417_multiimage_span.rs | 2 +- 26 files changed, 102 insertions(+), 108 deletions(-) diff --git a/src/client/result/AddressBookAUResultParser.rs b/src/client/result/AddressBookAUResultParser.rs index 5be1152..42fd40d 100644 --- a/src/client/result/AddressBookAUResultParser.rs +++ b/src/client/result/AddressBookAUResultParser.rs @@ -62,18 +62,18 @@ pub fn parse(result: &RXingResult) -> Option { Vec::new() }, Vec::new(), - pronunciation.unwrap_or_default(), //"".to_owned(), + pronunciation.unwrap_or_default(), phoneNumbers, Vec::new(), emails, //Vec::new(), Vec::new(), - "".to_owned(), + String::default(), note, addresses, Vec::new(), - "".to_owned(), - "".to_owned(), - "".to_owned(), + String::default(), + String::default(), + String::default(), Vec::new(), Vec::new(), ) { diff --git a/src/client/result/AddressBookDoCoMoResultParser.rs b/src/client/result/AddressBookDoCoMoResultParser.rs index c0e82c1..639dc18 100644 --- a/src/client/result/AddressBookDoCoMoResultParser.rs +++ b/src/client/result/AddressBookDoCoMoResultParser.rs @@ -61,7 +61,7 @@ pub fn parse(result: &RXingResult) -> Option { .unwrap_or_default(); if !ResultParser::isStringOfDigits(&birthday, 8) { // No reason to throw out the whole card because the birthday is formatted wrong. - birthday = "".to_owned(); + birthday = String::default(); } let urls = ResultParser::match_do_co_mo_prefixed_field("URL:", &rawText).unwrap_or_default(); @@ -78,13 +78,13 @@ pub fn parse(result: &RXingResult) -> Option { Vec::new(), emails, Vec::new(), - "".to_owned(), + String::default(), note, addresses, Vec::new(), org, birthday, - "".to_owned(), + String::default(), urls, Vec::new(), ) { diff --git a/src/client/result/AddressBookParsedResult.rs b/src/client/result/AddressBookParsedResult.rs index 54e5db3..cfcaffe 100644 --- a/src/client/result/AddressBookParsedResult.rs +++ b/src/client/result/AddressBookParsedResult.rs @@ -83,18 +83,18 @@ impl AddressBookParsedRXingResult { Self::with_details( names, Vec::new(), - "".to_owned(), + String::default(), phone_numbers, phone_types, emails, email_types, - "".to_owned(), - "".to_owned(), + String::default(), + String::default(), addresses, address_types, - "".to_owned(), - "".to_owned(), - "".to_owned(), + String::default(), + String::default(), + String::default(), Vec::new(), Vec::new(), ) diff --git a/src/client/result/BizcardResultParser.rs b/src/client/result/BizcardResultParser.rs index 28e2d4d..83fac40 100644 --- a/src/client/result/BizcardResultParser.rs +++ b/src/client/result/BizcardResultParser.rs @@ -63,17 +63,17 @@ pub fn parse(result: &RXingResult) -> Option { if let Ok(adb) = AddressBookParsedRXingResult::with_details( ResultParser::maybeWrap(Some(fullName))?, Vec::new(), - "".to_owned(), + String::default(), buildPhoneNumbers(phoneNumber1, phoneNumber2, phoneNumber3), Vec::new(), ResultParser::maybeWrap(Some(email))?, Vec::new(), - "".to_owned(), - "".to_owned(), + String::default(), + String::default(), addresses?, Vec::new(), org, - "".to_owned(), + String::default(), title, Vec::new(), Vec::new(), diff --git a/src/client/result/BookmarkDoCoMoResultParser.rs b/src/client/result/BookmarkDoCoMoResultParser.rs index 4d99f84..8c077b9 100644 --- a/src/client/result/BookmarkDoCoMoResultParser.rs +++ b/src/client/result/BookmarkDoCoMoResultParser.rs @@ -37,7 +37,7 @@ pub fn parse(result: &RXingResult) -> Option { if URIResultParser::is_basically_valid_uri(&uri) { Some(ParsedClientResult::URIResult(URIParsedRXingResult::new( uri, - title.unwrap_or_else(|| "".to_owned()), + title.unwrap_or_else(|| String::default()), ))) } else { None diff --git a/src/client/result/CalendarParsedResult.rs b/src/client/result/CalendarParsedResult.rs index 2447645..16c50ba 100644 --- a/src/client/result/CalendarParsedResult.rs +++ b/src/client/result/CalendarParsedResult.rs @@ -244,7 +244,7 @@ impl CalendarParsedRXingResult { fn format_event(allDay: bool, date: i64) -> String { if date < 0 { - return "".to_owned(); + return String::default(); } let format_string = if allDay { "%F" } else { "%c" }; // DateFormat format = allDay @@ -254,7 +254,7 @@ impl CalendarParsedRXingResult { if let Some(dtm) = NaiveDateTime::from_timestamp_opt(date, 0) { dtm.format(format_string).to_string() } else { - String::from("") + String::default() } } diff --git a/src/client/result/CalendarParsedResultTestCase.rs b/src/client/result/CalendarParsedResultTestCase.rs index 131699b..e2e2609 100644 --- a/src/client/result/CalendarParsedResultTestCase.rs +++ b/src/client/result/CalendarParsedResultTestCase.rs @@ -225,7 +225,7 @@ fn doTest( assert_eq!( endString, if calRXingResult.getEndTimestamp() < 0i64 { - "".to_owned() + String::default() } else { format_date_string(calRXingResult.getEndTimestamp(), dateFormat) // dateFormat.format(calRXingResult.getEndTimestamp()) @@ -253,7 +253,7 @@ fn format_date_string(timestamp: i64, format_string: &str) -> String { if let Some(dtm) = NaiveDateTime::from_timestamp_opt(timestamp, 0) { dtm.format(format_string).to_string() } else { - String::from("") + String::default() } // DateTime::from(timestamp,0).with_timezone(Utc).format(format_string).to_string() } diff --git a/src/client/result/EmailAddressParsedResult.rs b/src/client/result/EmailAddressParsedResult.rs index 98e5389..c1761a9 100644 --- a/src/client/result/EmailAddressParsedResult.rs +++ b/src/client/result/EmailAddressParsedResult.rs @@ -55,8 +55,8 @@ impl EmailAddressParsedRXingResult { vec![to], Vec::new(), Vec::new(), - "".to_owned(), - "".to_owned(), + String::default(), + String::default(), ) } diff --git a/src/client/result/EmailAddressResultParser.rs b/src/client/result/EmailAddressResultParser.rs index 0570b8b..1c46bd9 100644 --- a/src/client/result/EmailAddressResultParser.rs +++ b/src/client/result/EmailAddressResultParser.rs @@ -79,8 +79,8 @@ pub fn parse(result: &RXingResult) -> Option { let nameValues = ResultParser::parseNameValuePairs(&rawText); let mut ccs: Vec = Vec::new(); let mut bccs: Vec = Vec::new(); - let mut subject = "".to_owned(); - let mut body = "".to_owned(); + let mut subject = String::default(); + let mut body = String::default(); if let Some(nv) = nameValues { // if (nameValues != null) { if tos.is_empty() { @@ -115,8 +115,8 @@ pub fn parse(result: &RXingResult) -> Option { // if bccString != null { // bccs = COMMA.split(bccString); // } - subject = nv.get("subject").unwrap_or(&"".to_owned()).clone(); - body = nv.get("body").unwrap_or(&"".to_owned()).clone(); + subject = nv.get("subject").unwrap_or(&String::default()).clone(); + body = nv.get("body").unwrap_or(&String::default()).clone(); } Some(ParsedClientResult::EmailResult( EmailAddressParsedRXingResult::with_details(tos, ccs, bccs, subject, body), diff --git a/src/client/result/ExpandedProductResultParser.rs b/src/client/result/ExpandedProductResultParser.rs index 95b0d76..8549006 100644 --- a/src/client/result/ExpandedProductResultParser.rs +++ b/src/client/result/ExpandedProductResultParser.rs @@ -52,19 +52,19 @@ pub fn parse(result: &crate::RXingResult) -> Option { } let rawText = ResultParser::getMassagedText(result); - let mut productID: String = "".to_owned(); // = null; - let mut sscc: String = "".to_owned(); - let mut lotNumber: String = "".to_owned(); - let mut productionDate: String = "".to_owned(); - let mut packagingDate: String = "".to_owned(); - let mut bestBeforeDate: String = "".to_owned(); - let mut expirationDate: String = "".to_owned(); - let mut weight: String = "".to_owned(); - let mut weightType: String = "".to_owned(); - let mut weightIncrement: String = "".to_owned(); - let mut price: String = "".to_owned(); - let mut priceIncrement: String = "".to_owned(); - let mut priceCurrency: String = "".to_owned(); + let mut productID: String = String::default(); // = null; + let mut sscc: String = String::default(); + let mut lotNumber: String = String::default(); + let mut productionDate: String = String::default(); + let mut packagingDate: String = String::default(); + let mut bestBeforeDate: String = String::default(); + let mut expirationDate: String = String::default(); + let mut weight: String = String::default(); + let mut weightType: String = String::default(); + let mut weightIncrement: String = String::default(); + let mut price: String = String::default(); + let mut priceIncrement: String = String::default(); + let mut priceCurrency: String = String::default(); let mut uncommonAIs = HashMap::new(); let mut i = 0; diff --git a/src/client/result/ParsedReaderResultTestCase.rs b/src/client/result/ParsedReaderResultTestCase.rs index 8485e27..cb4270a 100644 --- a/src/client/result/ParsedReaderResultTestCase.rs +++ b/src/client/result/ParsedReaderResultTestCase.rs @@ -503,7 +503,7 @@ fn format_date(year: i32, month: u32, day: u32) -> String { if let LocalResult::Single(dtm) = Utc.with_ymd_and_hms(year, month, day, 0, 0, 0) { dtm.format("%F").to_string() } else { - String::from("") + String::default() } // Calendar cal = Calendar.getInstance(); // cal.clear(); @@ -517,7 +517,7 @@ fn format_time(year: i32, month: u32, day: u32, hour: u32, min: u32, sec: u32) - dtm.format("%c").to_string() } else { - String::from("") + String::default() } // Calendar cal = Calendar.getInstance(); // cal.clear(); diff --git a/src/client/result/ResultParser.rs b/src/client/result/ResultParser.rs index bee9898..d7a89d1 100644 --- a/src/client/result/ResultParser.rs +++ b/src/client/result/ResultParser.rs @@ -167,7 +167,7 @@ pub fn parseRXingResult(the_rxing_result: &RXingResult) -> ParsedClientResult { ParsedClientResult::TextResult(TextParsedRXingResult::new( the_rxing_result.getText().to_owned(), - "".to_owned(), + String::default(), )) } @@ -284,7 +284,7 @@ pub fn appendKeyValue(keyValue: &str, result: &mut HashMap) { let kvp: Vec<&str> = keyValueTokens.take(2).collect(); if let [key, value] = kvp[..] { - let p_value = urlDecode(value).unwrap_or_else(|_| "".to_owned()); + let p_value = urlDecode(value).unwrap_or_else(|_| String::default()); result.insert(key.to_owned(), p_value); } diff --git a/src/client/result/SMSMMSResultParser.rs b/src/client/result/SMSMMSResultParser.rs index e5f9e66..967a95b 100644 --- a/src/client/result/SMSMMSResultParser.rs +++ b/src/client/result/SMSMMSResultParser.rs @@ -54,15 +54,15 @@ pub fn parse(result: &RXingResult) -> Option { return None; } - let mut subject = "".to_owned(); - let mut body = "".to_owned(); + let mut subject = String::default(); + let mut body = String::default(); let mut querySyntax = false; // Check up front if this is a URI syntax string with query arguments if let Some(name_value_pairs) = ResultParser::parseNameValuePairs(&raw_text) { if !name_value_pairs.is_empty() { - subject = String::from(name_value_pairs.get("subject").unwrap_or(&"".to_owned())); - body = String::from(name_value_pairs.get("body").unwrap_or(&"".to_owned())); + subject = String::from(name_value_pairs.get("subject").unwrap_or(&String::default())); + body = String::from(name_value_pairs.get("body").unwrap_or(&String::default())); querySyntax = true; } } @@ -130,7 +130,7 @@ fn add_number_via(numbers: &mut Vec, vias: &mut Vec, number_part } } else { numbers.push(number_part.to_owned()); - //vias.push("".to_owned()); + //vias.push(String::default()); } } diff --git a/src/client/result/SMSTOMMSTOResultParser.rs b/src/client/result/SMSTOMMSTOResultParser.rs index 714a170..22187f0 100644 --- a/src/client/result/SMSTOMMSTOResultParser.rs +++ b/src/client/result/SMSTOMMSTOResultParser.rs @@ -57,8 +57,8 @@ pub fn parse(result: &RXingResult) -> Option { Some(ParsedClientResult::SMSResult( SMSParsedRXingResult::with_singles( number.to_owned(), - String::from(""), - String::from(""), + String::default(), + String::default(), body.to_owned(), ), )) diff --git a/src/client/result/TelResultParser.rs b/src/client/result/TelResultParser.rs index 1d83756..f3a390b 100644 --- a/src/client/result/TelResultParser.rs +++ b/src/client/result/TelResultParser.rs @@ -51,7 +51,7 @@ pub fn parse(theRXingResult: &crate::RXingResult) -> Option Some(ParsedClientResult::TelResult(TelParsedRXingResult::new( number.to_owned(), telURI, - "".to_owned(), + String::default(), ))) } // } diff --git a/src/client/result/URIResultParser.rs b/src/client/result/URIResultParser.rs index d85d37c..135cb1e 100644 --- a/src/client/result/URIResultParser.rs +++ b/src/client/result/URIResultParser.rs @@ -59,7 +59,7 @@ pub fn parse(result: &RXingResult) -> Option { if raw_text.starts_with("URL:") || raw_text.starts_with("URI:") { return Some(ParsedClientResult::URIResult(URIParsedRXingResult::new( raw_text[4..].trim().to_owned(), - "".to_owned(), + String::default(), ))); // return new URIParsedRXingResult(rawText.substring(4).trim(), null); } @@ -69,7 +69,7 @@ pub fn parse(result: &RXingResult) -> Option { } Some(ParsedClientResult::URIResult(URIParsedRXingResult::new( raw_text.to_owned(), - "".to_owned(), + String::default(), ))) } diff --git a/src/client/result/VCardResultParser.rs b/src/client/result/VCardResultParser.rs index 3311c33..781b29f 100644 --- a/src/client/result/VCardResultParser.rs +++ b/src/client/result/VCardResultParser.rs @@ -116,10 +116,10 @@ pub fn parse(result: &RXingResult) -> Option { if isLikeVCardDate(&bday_array[0]) { bday_array } else { - vec!["".to_owned()] + vec![String::default()] } } else { - vec!["".to_owned()] + vec![String::default()] }; // if birthday != null && !isLikeVCardDate(birthday.get(0)) { // birthday = null; @@ -143,7 +143,7 @@ pub fn parse(result: &RXingResult) -> Option { if let Ok(adb) = AddressBookParsedRXingResult::with_details( toPrimaryValues(Some(names)), nicknames, - "".to_owned(), + String::default(), toPrimaryValues(phoneNumbers.clone()), toTypes(phoneNumbers), toPrimaryValues(emails.clone()), @@ -416,7 +416,7 @@ fn maybeAppendFragment(fragmentBuffer: &mut Vec, charset: &str, result: &mut let fragmentBytes = fragmentBuffer.clone(); let fragment; if charset.is_empty() { - fragment = String::from_utf8(fragmentBytes).unwrap_or_else(|_| "".to_owned()); + fragment = String::from_utf8(fragmentBytes).unwrap_or_else(|_| String::default()); // fragment = new String(fragmentBytes, StandardCharsets.UTF_8); } else if let Some(enc) = encoding::label::encoding_from_whatwg_label(charset) { fragment = if let Ok(encoded_result) = @@ -424,10 +424,10 @@ fn maybeAppendFragment(fragmentBuffer: &mut Vec, charset: &str, result: &mut { encoded_result } else { - String::from_utf8(fragmentBytes).unwrap_or_else(|_| "".to_owned()) + String::from_utf8(fragmentBytes).unwrap_or_else(|_| String::default()) } } else { - fragment = String::from_utf8(fragmentBytes).unwrap_or_else(|_| "".to_owned()) + fragment = String::from_utf8(fragmentBytes).unwrap_or_else(|_| String::default()) } fragmentBuffer.clear(); result.push_str(&fragment); @@ -451,19 +451,13 @@ pub fn matchSingleVCardPrefixedField( fn toPrimaryValue(list: Option>) -> String { if let Some(l) = list { if l.is_empty() { - "".to_owned() + String::default() } else { - l.get(0).unwrap_or(&"".to_owned()).clone() + l.get(0).unwrap_or(&String::default()).clone() } } else { - "".to_owned() + String::default() } - // if list.is_empty() { - // "".to_owned() - // }else { - // *list.get(0).unwrap_or(&"".to_owned()) - // } - // return list == null || list.isEmpty() ? null : list.get(0); } fn toPrimaryValues(lists: Option>>) -> Vec { @@ -496,11 +490,11 @@ fn toTypes(lists: Option>>) -> Vec { if let Some(value) = list.get(0) { if !value.is_empty() { let mut v_type = String::new(); - let final_value = list.last().unwrap_or(&"".to_owned()).clone(); + let final_value = list.last().unwrap_or(&String::default()).clone(); if !final_value.is_empty() { for i in 0..list.len() - 1 { // for (int i = 1; i < list.size(); i++) { - let metadatum = list.get(i).unwrap_or(&"".to_owned()).clone(); + let metadatum = list.get(i).unwrap_or(&String::default()).clone(); if let Some(equals) = metadatum.find('=') { if "TYPE" == (metadatum[0..equals]).to_uppercase() { v_type = metadatum[equals + 1..].to_owned(); @@ -544,12 +538,12 @@ fn formatNames(names: &mut Vec>) { for list in names { // for (List list : names) { let mut pos = 0; - while let Some(_fnd) = list.get(pos).unwrap_or(&"".to_owned()).find('=') { + while let Some(_fnd) = list.get(pos).unwrap_or(&String::default()).find('=') { pos += 1; } - let name = list.get(pos).unwrap_or(&"".to_owned()).clone(); + let name = list.get(pos).unwrap_or(&String::default()).clone(); - let mut components = vec!["".to_owned(); 5]; + let mut components = vec![String::default(); 5]; let mut start = 0; let mut end = 0; let mut componentIndex = 0; diff --git a/src/client/result/VEventResultParser.rs b/src/client/result/VEventResultParser.rs index 31887a7..ab79574 100644 --- a/src/client/result/VEventResultParser.rs +++ b/src/client/result/VEventResultParser.rs @@ -118,26 +118,26 @@ fn matchSingleVCardPrefixedField(prefix: &str, rawText: &str) -> String { VCardResultParser::matchSingleVCardPrefixedField(prefix, rawText, true, false) { if values.is_empty() { - "".to_owned() + String::default() } else { let tz_mod = if values.len() > 1 { if let Some(v) = values.get(values.len() - 2) { if let Some(tz_loc) = v.find("TZID=") { v[tz_loc + 5..].to_owned() } else { - "".to_owned() + String::default() } } else { - "".to_owned() + String::default() } } else { - "".to_owned() + String::default() }; let root_time = values.last().unwrap().clone(); format!("{root_time}{tz_mod}") } } else { - "".to_owned() + String::default() } // return values == null || values.isEmpty() ? null : values.get(0); } @@ -148,7 +148,7 @@ fn matchVCardPrefixedField(prefix: &str, rawText: &str) -> Vec { Vec::new() } else { let size = values.len(); - let mut result = vec!["".to_owned(); size]; //new String[size]; + let mut result = vec![String::default(); size]; //new String[size]; for (i, res) in result.iter_mut().enumerate().take(size) { // for i in 0..size { // for (int i = 0; i < size; i++) { diff --git a/src/client/result/WifiParsedResult.rs b/src/client/result/WifiParsedResult.rs index bce827c..d64b73d 100644 --- a/src/client/result/WifiParsedResult.rs +++ b/src/client/result/WifiParsedResult.rs @@ -67,10 +67,10 @@ impl WifiParsedRXingResult { ssid, password, hidden, - String::from(""), - String::from(""), - String::from(""), - String::from(""), + String::default(), + String::default(), + String::default(), + String::default(), ) } diff --git a/src/client/result/WifiResultParser.rs b/src/client/result/WifiResultParser.rs index 3e38642..3d55a1c 100644 --- a/src/client/result/WifiResultParser.rs +++ b/src/client/result/WifiResultParser.rs @@ -52,12 +52,12 @@ pub fn parse(theRXingResult: &crate::RXingResult) -> Option Option Option> = Lazy::new(|| pub fn parseFieldsInGeneralPurpose(rawInformation: &str) -> Result { if rawInformation.is_empty() { - return Ok("".to_owned()); + return Ok(String::default()); } // Processing 2-digit AIs diff --git a/src/oned/rss/expanded/decoders/general_app_id_decoder.rs b/src/oned/rss/expanded/decoders/general_app_id_decoder.rs index e03eb77..8e7f7ae 100644 --- a/src/oned/rss/expanded/decoders/general_app_id_decoder.rs +++ b/src/oned/rss/expanded/decoders/general_app_id_decoder.rs @@ -57,7 +57,7 @@ impl<'a> GeneralAppIdDecoder<'_> { ) -> Result { let mut buff = buff; let mut currentPosition = initialPosition; - let mut remaining = "".to_owned(); + let mut remaining = String::default(); loop { let info = self.decodeGeneralPurposeField(currentPosition, &remaining)?; let parsedFields = field_parser::parseFieldsInGeneralPurpose(info.getNewString())?; @@ -67,7 +67,7 @@ impl<'a> GeneralAppIdDecoder<'_> { if info.isRemaining() { remaining = info.getRemainingValue().to_string(); } else { - remaining = "".to_owned(); + remaining = String::default(); } if currentPosition == info.getNewPosition() { diff --git a/src/oned/rss/expanded/rss_expanded_image_2_result_test_case.rs b/src/oned/rss/expanded/rss_expanded_image_2_result_test_case.rs index 21a096f..f8290ff 100644 --- a/src/oned/rss/expanded/rss_expanded_image_2_result_test_case.rs +++ b/src/oned/rss/expanded/rss_expanded_image_2_result_test_case.rs @@ -49,18 +49,18 @@ fn testDecodeRow2result2() { let expected = ExpandedProductParsedRXingResult::new( "(01)90012345678908(3103)001750".to_owned(), "90012345678908".to_owned(), - "".to_owned(), - "".to_owned(), - "".to_owned(), - "".to_owned(), - "".to_owned(), - "".to_owned(), + String::default(), + String::default(), + String::default(), + String::default(), + String::default(), + String::default(), "001750".to_owned(), ExpandedProductParsedRXingResult::KILOGRAM.to_owned(), "3".to_owned(), - "".to_owned(), - "".to_owned(), - "".to_owned(), + String::default(), + String::default(), + String::default(), HashMap::new(), ); diff --git a/src/pdf417/decoder/pdf_417_decoder_test_case.rs b/src/pdf417/decoder/pdf_417_decoder_test_case.rs index 4be3d2b..add6d90 100644 --- a/src/pdf417/decoder/pdf_417_decoder_test_case.rs +++ b/src/pdf417/decoder/pdf_417_decoder_test_case.rs @@ -476,7 +476,7 @@ fn generatePermutation(index: u32, length: u32, chars: &[char]) -> String { baseNNumber.insert(0, '0'); // baseNNumber = "0" + baseNNumber; } - let mut prefix = String::from(""); + let mut prefix = String::default(); for ch in baseNNumber.chars() { prefix.push(chars[(ch as isize - '0' as isize) as usize]); } diff --git a/tests/common/abstract_black_box_test_case.rs b/tests/common/abstract_black_box_test_case.rs index 90d71c2..44e8934 100644 --- a/tests/common/abstract_black_box_test_case.rs +++ b/tests/common/abstract_black_box_test_case.rs @@ -509,7 +509,7 @@ impl AbstractBlackBoxTestCase { read_to_string(&file).expect("ok") } } else { - "".to_owned() + String::default() }; // let string_contents = read_to_string(&file)?; //new String(Files.readAllBytes(file), charset); if string_contents.ends_with('\n') { diff --git a/tests/common/pdf_417_multiimage_span.rs b/tests/common/pdf_417_multiimage_span.rs index 1da26d5..b2d01f4 100644 --- a/tests/common/pdf_417_multiimage_span.rs +++ b/tests/common/pdf_417_multiimage_span.rs @@ -651,7 +651,7 @@ impl PDF417MultiImageSpanAbstractBlackBoxTest read_to_string(&file).expect("ok") } } else { - "".to_owned() + String::default() }; // let string_contents = read_to_string(&file)?; //new String(Files.readAllBytes(file), charset); if string_contents.ends_with('\n') {