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

Implement clippy suggestions

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

21
src/oned/ean_13_writer.rs
View File

@@ -28,7 +28,7 @@ use super::{OneDimensionalCodeWriter, UPCEANReader, UPCEANWriter};
*
* @author aripollak@gmail.com (Ari Pollak)
*/
#[derive(OneDWriter)]
#[derive(OneDWriter, Default)]
pub struct EAN13Writer;
impl UPCEANWriter for EAN13Writer {}
@@ -40,9 +40,9 @@ impl OneDimensionalCodeWriter for EAN13Writer {
match length {
12 => {
// No check digit present, calculate it and add it
let check;
// try {
check = reader.getStandardUPCEANChecksum(&contents)?;
let check = reader.getStandardUPCEANChecksum(&contents)?;
// } catch (FormatException fe) {
// throw new IllegalArgumentException(fe);
// }
@@ -51,25 +51,25 @@ impl OneDimensionalCodeWriter for EAN13Writer {
13 => {
//try {
if !reader.checkStandardUPCEANChecksum(&contents)? {
return Err(Exceptions::IllegalArgumentException(
return Err(Exceptions::IllegalArgumentException(Some(
"Contents do not pass checksum".to_owned(),
));
)));
}
//} catch (FormatException ignored) {
//return Err( Exceptions::IllegalArgumentException("Illegal contents".to_owned()));
//}
}
_ => {
return Err(Exceptions::IllegalArgumentException(format!(
return Err(Exceptions::IllegalArgumentException(Some(format!(
"Requested contents should be 12 or 13 digits long, but got {}",
length
)))
))))
}
}
EAN13Writer::checkNumeric(&contents)?;
let firstDigit = contents.chars().nth(0).unwrap().to_digit(10).unwrap() as usize; //, 10);
let firstDigit = contents.chars().next().unwrap().to_digit(10).unwrap() as usize; //, 10);
let parities = EAN13Reader::FIRST_DIGIT_ENCODINGS[firstDigit];
let mut result = [false; CODE_WIDTH];
let mut pos = 0;
@@ -123,11 +123,6 @@ impl OneDimensionalCodeWriter for EAN13Writer {
Self::DEFAULT_MARGIN
}
}
impl Default for EAN13Writer {
fn default() -> Self {
Self {}
}
}
const CODE_WIDTH: usize = 3 + // start guard
(7 * 6) + // left bars