Implement clippy suggestions

This commit is contained in:
Henry Schimke
2023-01-04 14:48:16 -06:00
parent c65eadf102
commit 48287631dd
196 changed files with 2465 additions and 2574 deletions

View File

@@ -26,17 +26,12 @@ use super::{upc_ean_reader, UPCEANReader, STAND_IN};
/**
* @see UPCEANExtension2Support
*/
#[derive(Default)]
pub struct UPCEANExtension5Support {
//decodeMiddleCounters : [u32;4],
// decodeRowStringBuffer : String,
}
impl Default for UPCEANExtension5Support {
fn default() -> Self {
Self {}
}
}
impl UPCEANExtension5Support {
const CHECK_DIGIT_ENCODINGS: [usize; 10] =
[0x18, 0x14, 0x12, 0x11, 0x0C, 0x06, 0x03, 0x0A, 0x09, 0x05];
@@ -83,7 +78,7 @@ impl UPCEANExtension5Support {
// counters[2] = 0;
// counters[3] = 0;
let end = row.getSize();
let mut rowOffset = startRange[1] as usize;
let mut rowOffset = startRange[1];
let mut lgPatternFound = 0;
@@ -115,12 +110,12 @@ impl UPCEANExtension5Support {
}
if resultString.chars().count() != 5 {
return Err(Exceptions::NotFoundException("".to_owned()));
return Err(Exceptions::NotFoundException(None));
}
let checkDigit = Self::determineCheckDigit(lgPatternFound)?;
if Self::extensionChecksum(resultString) != checkDigit as u32 {
return Err(Exceptions::NotFoundException("".to_owned()));
return Err(Exceptions::NotFoundException(None));
}
Ok(rowOffset as u32)
@@ -146,7 +141,7 @@ impl UPCEANExtension5Support {
i -= 2;
}
sum *= 3;
return sum % 10;
sum % 10
}
fn determineCheckDigit(lgPatternFound: usize) -> Result<usize, Exceptions> {
@@ -156,7 +151,7 @@ impl UPCEANExtension5Support {
return Ok(d);
}
}
return Err(Exceptions::NotFoundException("".to_owned()));
Err(Exceptions::NotFoundException(None))
}
/**
@@ -184,7 +179,7 @@ impl UPCEANExtension5Support {
}
fn parseExtension5String(raw: &str) -> Option<String> {
let currency = match raw.chars().nth(0).unwrap() {
let currency = match raw.chars().next().unwrap() {
'0' => "£",
'5' => "$",
'9' => {