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

cargo clippy --fix

Browse Source
This commit is contained in:
Henry Schimke
2023-01-27 15:24:24 -06:00
parent 58e6827e89
commit 42d40de755
86 changed files with 196 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/oned/rss/expanded/decoders/abstract_expanded_decoder.rs
View File

@@ -150,7 +150,6 @@ pub fn createDecoder<'a>(
}
Err(Exceptions::IllegalStateException(Some(format!(
"unknown decoder: {}",
information
"unknown decoder: {information}"
))))
}

9
src/oned/rss/expanded/decoders/ai_013103_decoder.rs
View File

@@ -83,8 +83,7 @@ mod AI013103DecoderTest {
#[test]
fn test0131031() {
let data = format!(
"{}{}{}",
HEADER, COMPRESSED_GTIN900123456798908, COMPRESSED15BIT_WEIGHT1750
"{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT1750}"
);
let expected = "(01)90012345678908(3103)001750";
assertCorrectBinaryString(&data, expected);
@@ -93,8 +92,7 @@ mod AI013103DecoderTest {
#[test]
fn test0131032() {
let data = format!(
"{}{}{}",
HEADER, COMPRESSED_GTIN900000000000008, COMPRESSED15BIT_WEIGHT0
"{HEADER}{COMPRESSED_GTIN900000000000008}{COMPRESSED15BIT_WEIGHT0}"
);
let expected = "(01)90000000000003(3103)000000";
assertCorrectBinaryString(&data, expected);
@@ -104,8 +102,7 @@ mod AI013103DecoderTest {
#[should_panic]
fn test013103invalid() {
let data = format!(
"{}{}{}..",
HEADER, COMPRESSED_GTIN900123456798908, COMPRESSED15BIT_WEIGHT1750
"{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT1750}.."
);
assertCorrectBinaryString(&data, "");
}

6
src/oned/rss/expanded/decoders/ai_0132023203_decoder_test.rs
View File

@@ -35,8 +35,7 @@ const HEADER: &str = "..X.X";
#[test]
fn test0132021() {
let data = format!(
"{}{}{}",
HEADER, COMPRESSED_GTIN900123456798908, COMPRESSED15BIT_WEIGHT1750
"{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT1750}"
);
let expected = "(01)90012345678908(3202)001750";
@@ -46,8 +45,7 @@ fn test0132021() {
#[test]
fn test0132031() {
let data = format!(
"{}{}{}",
HEADER, COMPRESSED_GTIN900123456798908, COMPRESSED15BIT_WEIGHT11750
"{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT11750}"
);
let expected = "(01)90012345678908(3203)001750";

54
src/oned/rss/expanded/decoders/ai_013x0x1x_decoder.rs
View File

@@ -151,11 +151,7 @@ mod AI013X0X1XDecoderTest {
#[test]
fn test01310X1XendDate() {
let data = format!(
"{}{}{}{}",
HEADER310X11,
COMPRESSED_GTIN900123456798908,
COMPRESSED20BIT_WEIGHT1750,
COMPRESSED_DATE_END
"{HEADER310X11}{COMPRESSED_GTIN900123456798908}{COMPRESSED20BIT_WEIGHT1750}{COMPRESSED_DATE_END}"
);
let expected = "(01)90012345678908(3100)001750";
@@ -165,11 +161,7 @@ mod AI013X0X1XDecoderTest {
#[test]
fn test01310X111() {
let data = format!(
"{}{}{}{}",
HEADER310X11,
COMPRESSED_GTIN900123456798908,
COMPRESSED20BIT_WEIGHT1750,
COMPRESSED_DATE_MARCH12TH2010
"{HEADER310X11}{COMPRESSED_GTIN900123456798908}{COMPRESSED20BIT_WEIGHT1750}{COMPRESSED_DATE_MARCH12TH2010}"
);
let expected = "(01)90012345678908(3100)001750(11)100312";
@@ -179,11 +171,7 @@ mod AI013X0X1XDecoderTest {
#[test]
fn test01320X111() {
let data = format!(
"{}{}{}{}",
HEADER320X11,
COMPRESSED_GTIN900123456798908,
COMPRESSED20BIT_WEIGHT1750,
COMPRESSED_DATE_MARCH12TH2010
"{HEADER320X11}{COMPRESSED_GTIN900123456798908}{COMPRESSED20BIT_WEIGHT1750}{COMPRESSED_DATE_MARCH12TH2010}"
);
let expected = "(01)90012345678908(3200)001750(11)100312";
@@ -193,11 +181,7 @@ mod AI013X0X1XDecoderTest {
#[test]
fn test01310X131() {
let data = format!(
"{}{}{}{}",
HEADER310X13,
COMPRESSED_GTIN900123456798908,
COMPRESSED20BIT_WEIGHT1750,
COMPRESSED_DATE_MARCH12TH2010
"{HEADER310X13}{COMPRESSED_GTIN900123456798908}{COMPRESSED20BIT_WEIGHT1750}{COMPRESSED_DATE_MARCH12TH2010}"
);
let expected = "(01)90012345678908(3100)001750(13)100312";
@@ -207,11 +191,7 @@ mod AI013X0X1XDecoderTest {
#[test]
fn test01320X131() {
let data = format!(
"{}{}{}{}",
HEADER320X13,
COMPRESSED_GTIN900123456798908,
COMPRESSED20BIT_WEIGHT1750,
COMPRESSED_DATE_MARCH12TH2010
"{HEADER320X13}{COMPRESSED_GTIN900123456798908}{COMPRESSED20BIT_WEIGHT1750}{COMPRESSED_DATE_MARCH12TH2010}"
);
let expected = "(01)90012345678908(3200)001750(13)100312";
@@ -221,11 +201,7 @@ mod AI013X0X1XDecoderTest {
#[test]
fn test01310X151() {
let data = format!(
"{}{}{}{}",
HEADER310X15,
COMPRESSED_GTIN900123456798908,
COMPRESSED20BIT_WEIGHT1750,
COMPRESSED_DATE_MARCH12TH2010
"{HEADER310X15}{COMPRESSED_GTIN900123456798908}{COMPRESSED20BIT_WEIGHT1750}{COMPRESSED_DATE_MARCH12TH2010}"
);
let expected = "(01)90012345678908(3100)001750(15)100312";
@@ -235,11 +211,7 @@ mod AI013X0X1XDecoderTest {
#[test]
fn test01320X151() {
let data = format!(
"{}{}{}{}",
HEADER320X15,
COMPRESSED_GTIN900123456798908,
COMPRESSED20BIT_WEIGHT1750,
COMPRESSED_DATE_MARCH12TH2010
"{HEADER320X15}{COMPRESSED_GTIN900123456798908}{COMPRESSED20BIT_WEIGHT1750}{COMPRESSED_DATE_MARCH12TH2010}"
);
let expected = "(01)90012345678908(3200)001750(15)100312";
@@ -249,11 +221,7 @@ mod AI013X0X1XDecoderTest {
#[test]
fn test01310X171() {
let data = format!(
"{}{}{}{}",
HEADER310X17,
COMPRESSED_GTIN900123456798908,
COMPRESSED20BIT_WEIGHT1750,
COMPRESSED_DATE_MARCH12TH2010
"{HEADER310X17}{COMPRESSED_GTIN900123456798908}{COMPRESSED20BIT_WEIGHT1750}{COMPRESSED_DATE_MARCH12TH2010}"
);
let expected = "(01)90012345678908(3100)001750(17)100312";
@@ -263,11 +231,7 @@ mod AI013X0X1XDecoderTest {
#[test]
fn test01320X171() {
let data = format!(
"{}{}{}{}",
HEADER320X17,
COMPRESSED_GTIN900123456798908,
COMPRESSED20BIT_WEIGHT1750,
COMPRESSED_DATE_MARCH12TH2010
"{HEADER320X17}{COMPRESSED_GTIN900123456798908}{COMPRESSED20BIT_WEIGHT1750}{COMPRESSED_DATE_MARCH12TH2010}"
);
let expected = "(01)90012345678908(3200)001750(17)100312";

26
src/oned/rss/expanded/decoders/any_ai_decoder.rs
View File

@@ -70,8 +70,7 @@ mod AnyAIDecoderTest {
#[test]
fn testAnyAIDecoder1() {
let data = format!(
"{}{}{}{}{}{}{}",
HEADER, NUMERIC10, NUMERIC12, NUMERIC2ALPHA, ALPHA_A, ALPHA2NUMERIC, NUMERIC12
"{HEADER}{NUMERIC10}{NUMERIC12}{NUMERIC2ALPHA}{ALPHA_A}{ALPHA2NUMERIC}{NUMERIC12}"
);
let expected = "(10)12A12";
@@ -81,8 +80,7 @@ mod AnyAIDecoderTest {
#[test]
fn testAnyAIDecoder2() {
let data = format!(
"{}{}{}{}{}{}{}",
HEADER, NUMERIC10, NUMERIC12, NUMERIC2ALPHA, ALPHA_A, ALPHA2ISOIEC646, I646_B
"{HEADER}{NUMERIC10}{NUMERIC12}{NUMERIC2ALPHA}{ALPHA_A}{ALPHA2ISOIEC646}{I646_B}"
);
let expected = "(10)12AB";
@@ -92,17 +90,7 @@ mod AnyAIDecoderTest {
#[test]
fn testAnyAIDecoder3() {
let data = format!(
"{}{}{}{}{}{}{}{}{}{}",
HEADER,
NUMERIC10,
NUMERIC2ALPHA,
ALPHA2ISOIEC646,
I646_B,
I646_C,
ISOIEC6462ALPHA,
ALPHA_A,
ALPHA2NUMERIC,
NUMERIC10
"{HEADER}{NUMERIC10}{NUMERIC2ALPHA}{ALPHA2ISOIEC646}{I646_B}{I646_C}{ISOIEC6462ALPHA}{ALPHA_A}{ALPHA2NUMERIC}{NUMERIC10}"
);
let expected = "(10)BCA10";
@@ -111,7 +99,7 @@ mod AnyAIDecoderTest {
#[test]
fn testAnyAIDecodernumericFNC1secondDigit() {
let data = format!("{}{}{}", HEADER, NUMERIC10, NUMERIC1_FNC1);
let data = format!("{HEADER}{NUMERIC10}{NUMERIC1_FNC1}");
let expected = "(10)1";
assertCorrectBinaryString(&data, expected);
@@ -120,8 +108,7 @@ mod AnyAIDecoderTest {
#[test]
fn testAnyAIDecoderalphaFNC1() {
let data = format!(
"{}{}{}{}{}",
HEADER, NUMERIC10, NUMERIC2ALPHA, ALPHA_A, ALPHA_FNC1
"{HEADER}{NUMERIC10}{NUMERIC2ALPHA}{ALPHA_A}{ALPHA_FNC1}"
);
let expected = "(10)A";
@@ -131,8 +118,7 @@ mod AnyAIDecoderTest {
#[test]
fn testAnyAIDecoder646FNC1() {
let data = format!(
"{}{}{}{}{}{}{}",
HEADER, NUMERIC10, NUMERIC2ALPHA, ALPHA_A, ISOIEC6462ALPHA, I646_B, I646_FNC1
"{HEADER}{NUMERIC10}{NUMERIC2ALPHA}{ALPHA_A}{ISOIEC6462ALPHA}{I646_B}{I646_FNC1}"
);
let expected = "(10)AB";

8
src/oned/rss/expanded/decoders/field_parser.rs
View File

@@ -215,13 +215,13 @@ fn processFixedAI(
.take(fieldSize)
.collect(); //rawInformation.substring(aiSize, aiSize + fieldSize);
let remaining: String = rawInformation.chars().skip(aiSize + fieldSize).collect(); // rawInformation.substring(aiSize + fieldSize);
let result = format!("({}){}", ai, field);
let result = format!("({ai}){field}");
let parsedAI = parseFieldsInGeneralPurpose(&remaining)?;
Ok(if parsedAI.is_empty() {
result
} else {
format!("{}{}", result, parsedAI)
format!("{result}{parsedAI}")
})
}
@@ -237,13 +237,13 @@ fn processVariableAI(
.min(aiSize + variableFieldSize);
let field: String = rawInformation.chars().skip(aiSize).take(maxSize).collect(); // (aiSize, maxSize);
let remaining: String = rawInformation.chars().skip(maxSize).collect();
let result = format!("({}){}", ai, field); //'(' + ai + ')' + field;
let result = format!("({ai}){field}"); //'(' + ai + ')' + field;
let parsedAI = parseFieldsInGeneralPurpose(&remaining)?;
Ok(if parsedAI.is_empty() {
result
} else {
format!("{}{}", result, parsedAI)
format!("{result}{parsedAI}")
})
}

3
src/oned/rss/expanded/decoders/general_app_id_decoder.rs
View File

@@ -445,8 +445,7 @@ impl<'a> GeneralAppIdDecoder<'_> {
62 => '/',
_ => {
return Err(Exceptions::IllegalStateException(Some(format!(
"Decoding invalid alphanumeric value: {}",
sixBitValue
"Decoding invalid alphanumeric value: {sixBitValue}"
))))
}
};

2
src/oned/rss/expanded/expanded_row.rs
View File

@@ -68,7 +68,7 @@ impl Display for ExpandedRow {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{{ ")?;
for p in &self.pairs {
write!(f, "{}", p)?;
write!(f, "{p}")?;
}
write!(f, " }}") //{:?} }} " , self.pairs )
}

2
src/oned/rss/expanded/rss_expanded_image_2_binary_test_tase.rs
View File

@@ -171,7 +171,7 @@ fn testDecodeRow2binary22() {
}
fn assertCorrectImage2binary(fileName: &str, expected: &str) {
let path = format!("test_resources/blackbox/rssexpanded-1/{}", fileName);
let path = format!("test_resources/blackbox/rssexpanded-1/{fileName}");
let image = image::open(path).expect("file exists");
let binaryMap = BinaryBitmap::new(Rc::new(GlobalHistogramBinarizer::new(Box::new(

2
src/oned/rss/expanded/rss_expanded_image_2_result_test_case.rs
View File

@@ -68,7 +68,7 @@ fn testDecodeRow2result2() {
}
fn assertCorrectImage2result(fileName: &str, expected: ExpandedProductParsedRXingResult) {
let path = format!("test_resources/blackbox/rssexpanded-1/{}", fileName);
let path = format!("test_resources/blackbox/rssexpanded-1/{fileName}");
let image = image::open(path).expect("image must exist");
let binaryMap = BinaryBitmap::new(Rc::new(GlobalHistogramBinarizer::new(Box::new(

2
src/oned/rss/expanded/rss_expanded_image_2_string_test_case.rs
View File

@@ -181,7 +181,7 @@ fn testDecodeRow2string32() {
}
fn assertCorrectImage2string(fileName: &str, expected: &str) {
let path = format!("test_resources/blackbox/rssexpanded-1/{}", fileName);
let path = format!("test_resources/blackbox/rssexpanded-1/{fileName}");
let image = image::open(path).expect("load image");
let binaryMap = BinaryBitmap::new(Rc::new(GlobalHistogramBinarizer::new(Box::new(

3
src/oned/rss/expanded/rss_expanded_internal_test_case.rs
View File

@@ -172,8 +172,7 @@ fn testDecodeDataCharacter() {
fn readImage(fileName: &str) -> image::DynamicImage {
image::open(format!(
"test_resources/blackbox/rssexpanded-1/{}",
fileName
"test_resources/blackbox/rssexpanded-1/{fileName}"
))
.unwrap()
// Path path = AbstractBlackBoxTestCase.buildTestBase("src/test/resources/blackbox/rssexpanded-1/").resolve(fileName);

2
src/oned/rss/expanded/test_case_util.rs
View File

@@ -31,7 +31,7 @@ use image::DynamicImage;
use crate::{common::GlobalHistogramBinarizer, BinaryBitmap, BufferedImageLuminanceSource};
fn getBufferedImage(fileName: &str) -> DynamicImage {
let path = format!("test_resources/blackbox/rssexpandedstacked-2/{}", fileName);
let path = format!("test_resources/blackbox/rssexpandedstacked-2/{fileName}");
image::open(path).expect("load image")
}