From 465485d1f462f3304cd1b6f176246a4519bb3eab Mon Sep 17 00:00:00 2001 From: Henry Schimke Date: Fri, 27 Jan 2023 15:25:19 -0600 Subject: [PATCH] cargo fmt --- src/client/result/AddressBookAUResultParser.rs | 8 ++------ src/maxicode/decoder/decoded_bit_stream_parser.rs | 10 ++-------- src/maxicode/detector.rs | 2 +- src/oned/rss/expanded/decoders/ai_013103_decoder.rs | 13 ++++--------- .../expanded/decoders/ai_0132023203_decoder_test.rs | 8 ++------ src/oned/rss/expanded/decoders/any_ai_decoder.rs | 4 +--- .../rss/expanded/rss_expanded_internal_test_case.rs | 5 +---- 7 files changed, 13 insertions(+), 37 deletions(-) diff --git a/src/client/result/AddressBookAUResultParser.rs b/src/client/result/AddressBookAUResultParser.rs index bb8dbf6..5be1152 100644 --- a/src/client/result/AddressBookAUResultParser.rs +++ b/src/client/result/AddressBookAUResultParser.rs @@ -88,12 +88,8 @@ fn matchMultipleValuePrefix(prefix: &str, rawText: &str) -> Vec { // For now, always 3, and always trim for i in 1..=3 { // for (int i = 1; i <= 3; i++) { - let value = ResultParser::matchSinglePrefixedField( - &format!("{prefix}{i}:"), - rawText, - '\r', - true, - ); + let value = + ResultParser::matchSinglePrefixedField(&format!("{prefix}{i}:"), rawText, '\r', true); if value.is_none() { break; } diff --git a/src/maxicode/decoder/decoded_bit_stream_parser.rs b/src/maxicode/decoder/decoded_bit_stream_parser.rs index 6d4e318..372ae67 100644 --- a/src/maxicode/decoder/decoded_bit_stream_parser.rs +++ b/src/maxicode/decoder/decoded_bit_stream_parser.rs @@ -101,15 +101,9 @@ pub fn decode(bytes: &[u8], mode: u8) -> Result let service = format!("{:0>3}", getServiceClass(bytes)); result.push_str(&getMessage(bytes, 10, 84)); if result.starts_with(&format!("[)>{}{}{}", RS, "01", GS)) { - result.insert_str( - 9, - &format!("{postcode}{GS}{country}{GS}{service}{GS}"), - ); + result.insert_str(9, &format!("{postcode}{GS}{country}{GS}{service}{GS}")); } else { - result.insert_str( - 0, - &format!("{postcode}{GS}{country}{GS}{service}{GS}"), - ); + result.insert_str(0, &format!("{postcode}{GS}{country}{GS}{service}{GS}")); } } 4 => { diff --git a/src/maxicode/detector.rs b/src/maxicode/detector.rs index 42eb930..105281b 100644 --- a/src/maxicode/detector.rs +++ b/src/maxicode/detector.rs @@ -141,7 +141,7 @@ impl<'a> Circle<'_> { let mut lengths = [(0, 0.0, [(0.0_f32, 0.0); 2]); 72]; let mut circle_points = Vec::new(); // for i_rotation in 0..72 { - for (i_rotation, length_set) in lengths.iter_mut().enumerate(){ + for (i_rotation, length_set) in lengths.iter_mut().enumerate() { let rotation = i_rotation as f32 * 5.0; let (length, points) = self.find_width_at_degree(rotation); circle_points.extend_from_slice(&points); diff --git a/src/oned/rss/expanded/decoders/ai_013103_decoder.rs b/src/oned/rss/expanded/decoders/ai_013103_decoder.rs index 32b7b5a..1b63c39 100644 --- a/src/oned/rss/expanded/decoders/ai_013103_decoder.rs +++ b/src/oned/rss/expanded/decoders/ai_013103_decoder.rs @@ -82,18 +82,14 @@ mod AI013103DecoderTest { #[test] fn test0131031() { - let data = format!( - "{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT1750}" - ); + let data = format!("{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT1750}"); let expected = "(01)90012345678908(3103)001750"; assertCorrectBinaryString(&data, expected); } #[test] fn test0131032() { - let data = format!( - "{HEADER}{COMPRESSED_GTIN900000000000008}{COMPRESSED15BIT_WEIGHT0}" - ); + let data = format!("{HEADER}{COMPRESSED_GTIN900000000000008}{COMPRESSED15BIT_WEIGHT0}"); let expected = "(01)90000000000003(3103)000000"; assertCorrectBinaryString(&data, expected); } @@ -101,9 +97,8 @@ mod AI013103DecoderTest { #[test] #[should_panic] fn test013103invalid() { - let data = format!( - "{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT1750}.." - ); + let data = + format!("{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT1750}.."); assertCorrectBinaryString(&data, ""); } } diff --git a/src/oned/rss/expanded/decoders/ai_0132023203_decoder_test.rs b/src/oned/rss/expanded/decoders/ai_0132023203_decoder_test.rs index b2055e9..54c8ccb 100644 --- a/src/oned/rss/expanded/decoders/ai_0132023203_decoder_test.rs +++ b/src/oned/rss/expanded/decoders/ai_0132023203_decoder_test.rs @@ -34,9 +34,7 @@ const HEADER: &str = "..X.X"; #[test] fn test0132021() { - let data = format!( - "{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT1750}" - ); + let data = format!("{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT1750}"); let expected = "(01)90012345678908(3202)001750"; assertCorrectBinaryString(&data, expected); @@ -44,9 +42,7 @@ fn test0132021() { #[test] fn test0132031() { - let data = format!( - "{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT11750}" - ); + let data = format!("{HEADER}{COMPRESSED_GTIN900123456798908}{COMPRESSED15BIT_WEIGHT11750}"); let expected = "(01)90012345678908(3203)001750"; assertCorrectBinaryString(&data, expected); diff --git a/src/oned/rss/expanded/decoders/any_ai_decoder.rs b/src/oned/rss/expanded/decoders/any_ai_decoder.rs index a551039..f3c20ad 100644 --- a/src/oned/rss/expanded/decoders/any_ai_decoder.rs +++ b/src/oned/rss/expanded/decoders/any_ai_decoder.rs @@ -107,9 +107,7 @@ mod AnyAIDecoderTest { #[test] fn testAnyAIDecoderalphaFNC1() { - let data = format!( - "{HEADER}{NUMERIC10}{NUMERIC2ALPHA}{ALPHA_A}{ALPHA_FNC1}" - ); + let data = format!("{HEADER}{NUMERIC10}{NUMERIC2ALPHA}{ALPHA_A}{ALPHA_FNC1}"); let expected = "(10)A"; assertCorrectBinaryString(&data, expected); diff --git a/src/oned/rss/expanded/rss_expanded_internal_test_case.rs b/src/oned/rss/expanded/rss_expanded_internal_test_case.rs index 8680710..c05b31f 100644 --- a/src/oned/rss/expanded/rss_expanded_internal_test_case.rs +++ b/src/oned/rss/expanded/rss_expanded_internal_test_case.rs @@ -171,10 +171,7 @@ fn testDecodeDataCharacter() { } fn readImage(fileName: &str) -> image::DynamicImage { - image::open(format!( - "test_resources/blackbox/rssexpanded-1/{fileName}" - )) - .unwrap() + image::open(format!("test_resources/blackbox/rssexpanded-1/{fileName}")).unwrap() // Path path = AbstractBlackBoxTestCase.buildTestBase("src/test/resources/blackbox/rssexpanded-1/").resolve(fileName); // return ImageIO.read(path.toFile()); }