From b561bd77c3a437c1b09247a7585c6baea68540b2 Mon Sep 17 00:00:00 2001 From: Steve Cook Date: Wed, 1 Mar 2023 13:43:21 -0500 Subject: [PATCH] Update macro and cargo fmt --- crates/one-d-proc-derive/src/lib.rs | 14 ++++----- src/client/result/CalendarParsedResult.rs | 16 ++++++++-- src/client/result/ResultParser.rs | 4 ++- src/common/bit_matrix.rs | 8 +++-- src/common/reedsolomon/reedsolomon_encoder.rs | 4 ++- src/datamatrix/encoder/base256_encoder.rs | 8 +++-- src/datamatrix/encoder/c40_encoder.rs | 4 +-- src/helpers.rs | 5 ++- src/maxicode/detector.rs | 7 ++--- src/oned/coda_bar_reader.rs | 3 +- src/oned/code_128_writer.rs | 3 +- src/oned/code_39_reader.rs | 5 ++- src/oned/code_93_reader.rs | 12 +++++-- src/oned/rss/expanded/rss_expanded_reader.rs | 8 +++-- src/oned/upc_e_reader.rs | 4 +-- .../decoder/decoded_bit_stream_parser.rs | 4 +-- .../decoder/decoded_bit_stream_parser.rs | 7 ++++- src/qrcode/encoder/minimal_encoder.rs | 31 ++++++++----------- src/qrcode/encoder/qrcode_encoder.rs | 18 ++++++++--- 19 files changed, 101 insertions(+), 64 deletions(-) diff --git a/crates/one-d-proc-derive/src/lib.rs b/crates/one-d-proc-derive/src/lib.rs index 3d26ec2..4d59b12 100644 --- a/crates/one-d-proc-derive/src/lib.rs +++ b/crates/one-d-proc-derive/src/lib.rs @@ -70,7 +70,7 @@ fn impl_one_d_reader_macro(ast: &syn::DeriveInput) -> TokenStream { Ok(result) } else { - return Err(Exceptions::NotFoundException(None)) + return Err(Exceptions::NOT_FOUND) } } } @@ -143,23 +143,23 @@ fn impl_one_d_writer_macro(ast: &syn::DeriveInput) -> TokenStream { hints: &crate::EncodingHintDictionary, ) -> Result { if contents.is_empty() { - return Err(Exceptions::IllegalArgumentException( - Some("Found empty contents".to_owned()), + return Err(Exceptions::illegal_argument_with( + "Found empty contents" )); } if width < 0 || height < 0 { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegal_argument_with(format!( "Negative size is not allowed. Input: {}x{}", width, height - )))); + ))); } if let Some(supportedFormats) = self.getSupportedWriteFormats() { if !supportedFormats.contains(format) { - return Err(Exceptions::IllegalArgumentException(Some(format!( + return Err(Exceptions::illegal_argument_with(format!( "Can only encode {:?}, but got {:?}", supportedFormats, format - )))); + ))); } } diff --git a/src/client/result/CalendarParsedResult.rs b/src/client/result/CalendarParsedResult.rs index aa9b800..59cf3a2 100644 --- a/src/client/result/CalendarParsedResult.rs +++ b/src/client/result/CalendarParsedResult.rs @@ -182,10 +182,18 @@ impl CalendarParsedRXingResult { }; } // The when string can be local time, or UTC if it ends with a Z - if when.len() == 16 && when.chars().nth(15).ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)? == 'Z' { + if when.len() == 16 + && when + .chars() + .nth(15) + .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)? + == 'Z' + { return match Utc.datetime_from_str(&when, "%Y%m%dT%H%M%SZ") { Ok(dtm) => Ok(dtm.with_timezone(&Utc).timestamp()), - Err(e) => Err(Exceptions::parse_with(format!("couldn't parse string: {e}"))), + Err(e) => Err(Exceptions::parse_with(format!( + "couldn't parse string: {e}" + ))), }; } // Try once more, with weird tz formatting @@ -202,7 +210,9 @@ impl CalendarParsedRXingResult { }; return match Utc.datetime_from_str(time_part, "%Y%m%dT%H%M%S") { Ok(dtm) => Ok(dtm.with_timezone(&tz_parsed).timestamp()), - Err(e) => Err(Exceptions::parse_with(format!("couldn't parse string: {e}"))), + Err(e) => Err(Exceptions::parse_with(format!( + "couldn't parse string: {e}" + ))), }; } diff --git a/src/client/result/ResultParser.rs b/src/client/result/ResultParser.rs index 32f9356..997ab23 100644 --- a/src/client/result/ResultParser.rs +++ b/src/client/result/ResultParser.rs @@ -300,7 +300,9 @@ pub fn urlDecode(encoded: &str) -> Result { if let Ok(decoded) = decode(encoded) { Ok(decoded.to_string()) } else { - Err(Exceptions::illegal_state_with("UnsupportedEncodingException")) + Err(Exceptions::illegal_state_with( + "UnsupportedEncodingException", + )) } } diff --git a/src/common/bit_matrix.rs b/src/common/bit_matrix.rs index 8c9a4d5..5232b2a 100644 --- a/src/common/bit_matrix.rs +++ b/src/common/bit_matrix.rs @@ -152,7 +152,9 @@ impl BitMatrix { first_run = false; rowLength = bitsPos - rowStartPos; } else if bitsPos - rowStartPos != rowLength { - return Err(Exceptions::illegal_argument_with("row lengths do not match")); + return Err(Exceptions::illegal_argument_with( + "row lengths do not match", + )); } rowStartPos = bitsPos; nRows += 1; @@ -181,7 +183,9 @@ impl BitMatrix { // first_run = false; rowLength = bitsPos - rowStartPos; } else if bitsPos - rowStartPos != rowLength { - return Err(Exceptions::illegal_argument_with("row lengths do not match")); + return Err(Exceptions::illegal_argument_with( + "row lengths do not match", + )); } nRows += 1; } diff --git a/src/common/reedsolomon/reedsolomon_encoder.rs b/src/common/reedsolomon/reedsolomon_encoder.rs index bcc027e..d4206ec 100644 --- a/src/common/reedsolomon/reedsolomon_encoder.rs +++ b/src/common/reedsolomon/reedsolomon_encoder.rs @@ -74,7 +74,9 @@ impl ReedSolomonEncoder { pub fn encode(&mut self, to_encode: &mut Vec, ec_bytes: usize) -> Result<()> { if ec_bytes == 0 { - return Err(Exceptions::illegal_argument_with("No error correction bytes")); + return Err(Exceptions::illegal_argument_with( + "No error correction bytes", + )); } let data_bytes = to_encode.len() - ec_bytes; if data_bytes == 0 { diff --git a/src/datamatrix/encoder/base256_encoder.rs b/src/datamatrix/encoder/base256_encoder.rs index 3cf0560..5de1d2f 100644 --- a/src/datamatrix/encoder/base256_encoder.rs +++ b/src/datamatrix/encoder/base256_encoder.rs @@ -79,7 +79,8 @@ impl Encoder for Base256Encoder { .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?; buffer.insert( ci_pos, - char::from_u32(dataCount as u32 % 250).ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?, + char::from_u32(dataCount as u32 % 250) + .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?, ); } else { return Err(Exceptions::illegal_state_with(format!( @@ -92,7 +93,10 @@ impl Encoder for Base256Encoder { // for (int i = 0, c = buffer.length(); i < c; i++) { context.writeCodeword( Self::randomize255State( - buffer.chars().nth(i).ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?, + buffer + .chars() + .nth(i) + .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?, context.getCodewordCount() as u32 + 1, ) .ok_or(Exceptions::PARSE)? as u8, diff --git a/src/datamatrix/encoder/c40_encoder.rs b/src/datamatrix/encoder/c40_encoder.rs index 55c5e78..827d132 100644 --- a/src/datamatrix/encoder/c40_encoder.rs +++ b/src/datamatrix/encoder/c40_encoder.rs @@ -183,9 +183,7 @@ impl C40Encoder { context: &mut EncoderContext, buffer: &mut String, ) -> Result<()> { - context.writeCodewords( - &Self::encodeToCodewords(buffer).ok_or(Exceptions::FORMAT)?, - ); + context.writeCodewords(&Self::encodeToCodewords(buffer).ok_or(Exceptions::FORMAT)?); buffer.replace_range(0..3, ""); // buffer.delete(0, 3); Ok(()) diff --git a/src/helpers.rs b/src/helpers.rs index 5e6cc50..3843b02 100644 --- a/src/helpers.rs +++ b/src/helpers.rs @@ -153,9 +153,8 @@ pub fn detect_multiple_in_file_with_hints( file_name: &str, hints: &mut DecodingHintDictionary, ) -> Result> { - let img = image::open(file_name).map_err(|e| { - Exceptions::runtime_with(format!("couldn't read {file_name}: {e}")) - })?; + let img = image::open(file_name) + .map_err(|e| Exceptions::runtime_with(format!("couldn't read {file_name}: {e}")))?; let multi_format_reader = MultiFormatReader::default(); let mut scanner = GenericMultipleBarcodeReader::new(multi_format_reader); diff --git a/src/maxicode/detector.rs b/src/maxicode/detector.rs index 73fb298..f2015ff 100644 --- a/src/maxicode/detector.rs +++ b/src/maxicode/detector.rs @@ -375,8 +375,7 @@ pub fn detect(image: &BitMatrix, try_harder: bool) -> Result std::cmp::Ordering { /// Read appropriate bits from a bitmatrix for the maxicode decoder pub fn read_bits(image: &BitMatrix) -> Result { - let enclosingRectangle = image - .getEnclosingRectangle() - .ok_or(Exceptions::NOT_FOUND)?; + let enclosingRectangle = image.getEnclosingRectangle().ok_or(Exceptions::NOT_FOUND)?; let left = enclosingRectangle[0]; let top = enclosingRectangle[1]; diff --git a/src/oned/coda_bar_reader.rs b/src/oned/coda_bar_reader.rs index b1b5d7e..e8d88e5 100644 --- a/src/oned/coda_bar_reader.rs +++ b/src/oned/coda_bar_reader.rs @@ -113,7 +113,8 @@ impl OneDReader for CodaBarReader { .decodeRowRXingResult .chars() .nth(i) - .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)? as usize] + .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)? + as usize] .to_string(), ); } diff --git a/src/oned/code_128_writer.rs b/src/oned/code_128_writer.rs index ce6ae5e..540ede1 100644 --- a/src/oned/code_128_writer.rs +++ b/src/oned/code_128_writer.rs @@ -590,7 +590,8 @@ stuvwxyz{|}~\u{007F}\u{00FF}"; contents .chars() .nth(i) - .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)? as isize + .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)? + as isize - ' ' as isize } }; diff --git a/src/oned/code_39_reader.rs b/src/oned/code_39_reader.rs index 1096704..1405a1c 100644 --- a/src/oned/code_39_reader.rs +++ b/src/oned/code_39_reader.rs @@ -322,7 +322,10 @@ impl Code39Reader { while i < length { // for i in 0..length { // for (int i = 0; i < length; i++) { - let c = encoded.chars().nth(i).ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?; + let c = encoded + .chars() + .nth(i) + .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?; if c == '+' || c == '$' || c == '%' || c == '/' { let next = encoded .chars() diff --git a/src/oned/code_93_reader.rs b/src/oned/code_93_reader.rs index 3d4216a..75b18b3 100644 --- a/src/oned/code_93_reader.rs +++ b/src/oned/code_93_reader.rs @@ -234,7 +234,10 @@ impl Code93Reader { while i < length { // for i in 0..length { // for (int i = 0; i < length; i++) { - let c = encoded.chars().nth(i).ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?; + let c = encoded + .chars() + .nth(i) + .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?; if ('a'..='d').contains(&c) { if i >= length - 1 { return Err(Exceptions::FORMAT); @@ -334,7 +337,12 @@ impl Code93Reader { for i in (0..checkPosition).rev() { total += weight * Self::ALPHABET_STRING - .find(result.chars().nth(i).ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?) + .find( + result + .chars() + .nth(i) + .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?, + ) .map_or_else(|| -1_i32, |v| v as i32); weight += 1; if weight > weightMax as i32 { diff --git a/src/oned/rss/expanded/rss_expanded_reader.rs b/src/oned/rss/expanded/rss_expanded_reader.rs index cb928c2..97ce504 100644 --- a/src/oned/rss/expanded/rss_expanded_reader.rs +++ b/src/oned/rss/expanded/rss_expanded_reader.rs @@ -528,8 +528,8 @@ impl RSSExpandedReader { // Not private for unit testing pub(crate) fn constructRXingResult(pairs: &[ExpandedPair]) -> Result { - let binary = bit_array_builder::buildBitArray(&pairs.to_vec()) - .ok_or(Exceptions::ILLEGAL_STATE)?; + let binary = + bit_array_builder::buildBitArray(&pairs.to_vec()).ok_or(Exceptions::ILLEGAL_STATE)?; let mut decoder = abstract_expanded_decoder::createDecoder(&binary)?; let resultingString = decoder.parseInformation()?; @@ -692,7 +692,9 @@ impl RSSExpandedReader { } else if previousPairs.is_empty() { rowOffset = 0; } else { - let lastPair = previousPairs.last().ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?; + let lastPair = previousPairs + .last() + .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?; rowOffset = lastPair .getFinderPattern() .as_ref() diff --git a/src/oned/upc_e_reader.rs b/src/oned/upc_e_reader.rs index 238321c..19fe337 100644 --- a/src/oned/upc_e_reader.rs +++ b/src/oned/upc_e_reader.rs @@ -66,9 +66,7 @@ impl UPCEANReader for UPCEReader { } fn checkChecksum(&self, s: &str) -> Result { - self.checkStandardUPCEANChecksum( - &convertUPCEtoUPCA(s).ok_or(Exceptions::ILLEGAL_ARGUMENT)?, - ) + self.checkStandardUPCEANChecksum(&convertUPCEtoUPCA(s).ok_or(Exceptions::ILLEGAL_ARGUMENT)?) } fn decodeEnd(&self, row: &crate::common::BitArray, endStart: usize) -> Result<[usize; 2]> { diff --git a/src/pdf417/decoder/decoded_bit_stream_parser.rs b/src/pdf417/decoder/decoded_bit_stream_parser.rs index 75d35ad..566e74a 100644 --- a/src/pdf417/decoder/decoded_bit_stream_parser.rs +++ b/src/pdf417/decoder/decoded_bit_stream_parser.rs @@ -768,9 +768,7 @@ fn numericCompaction( Remove leading 1 => RXingResult is 000213298174000 */ fn decodeBase900toBase10(codewords: &[u32], count: usize) -> Result { - let mut result = 0 - .to_biguint() - .ok_or(Exceptions::ARITHMETIC)?; + let mut result = 0.to_biguint().ok_or(Exceptions::ARITHMETIC)?; for i in 0..count { result += &EXP900[count - i - 1] * (codewords[i].to_biguint().ok_or(Exceptions::ARITHMETIC)?); diff --git a/src/qrcode/decoder/decoded_bit_stream_parser.rs b/src/qrcode/decoder/decoded_bit_stream_parser.rs index 9a3d629..4d6451e 100644 --- a/src/qrcode/decoder/decoded_bit_stream_parser.rs +++ b/src/qrcode/decoder/decoded_bit_stream_parser.rs @@ -386,7 +386,12 @@ fn decodeAlphanumericSegment( if fc1InEffect { // We need to massage the result a bit if in an FNC1 mode: for i in start..result.len() { - if result.chars().nth(i).ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)? == '%' { + if result + .chars() + .nth(i) + .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)? + == '%' + { if i < result.len() - 1 && result .chars() diff --git a/src/qrcode/encoder/minimal_encoder.rs b/src/qrcode/encoder/minimal_encoder.rs index 6de4413..a367701 100644 --- a/src/qrcode/encoder/minimal_encoder.rs +++ b/src/qrcode/encoder/minimal_encoder.rs @@ -259,18 +259,13 @@ impl MinimalEncoder { position: usize, edge: Option>, ) -> Result<()> { - let vertexIndex = position - + edge - .as_ref() - .ok_or(Exceptions::FORMAT)? - .characterLength as usize; - let modeEdges = &mut edges[vertexIndex][edge - .as_ref() - .ok_or(Exceptions::FORMAT)? - .charsetEncoderIndex]; - let modeOrdinal = Self::getCompactedOrdinal(Some( - edge.as_ref().ok_or(Exceptions::FORMAT)?.mode, - ))? as usize; + let vertexIndex = + position + edge.as_ref().ok_or(Exceptions::FORMAT)?.characterLength as usize; + let modeEdges = + &mut edges[vertexIndex][edge.as_ref().ok_or(Exceptions::FORMAT)?.charsetEncoderIndex]; + let modeOrdinal = + Self::getCompactedOrdinal(Some(edge.as_ref().ok_or(Exceptions::FORMAT)?.mode))? + as usize; if modeEdges[modeOrdinal].is_none() || modeEdges[modeOrdinal] .as_ref() @@ -378,8 +373,8 @@ impl MinimalEncoder { 0, if from + 1 >= inputLength || !self.canEncode( - &Mode::ALPHANUMERIC, - self.stringToEncode + &Mode::ALPHANUMERIC, + self.stringToEncode .get(from + 1) .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?, ) @@ -414,8 +409,8 @@ impl MinimalEncoder { 0, if from + 1 >= inputLength || !self.canEncode( - &Mode::NUMERIC, - self.stringToEncode + &Mode::NUMERIC, + self.stringToEncode .get(from + 1) .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?, ) @@ -423,8 +418,8 @@ impl MinimalEncoder { 1 } else if from + 2 >= inputLength || !self.canEncode( - &Mode::NUMERIC, - self.stringToEncode + &Mode::NUMERIC, + self.stringToEncode .get(from + 2) .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?, ) diff --git a/src/qrcode/encoder/qrcode_encoder.rs b/src/qrcode/encoder/qrcode_encoder.rs index 82a7dfb..9d99b64 100644 --- a/src/qrcode/encoder/qrcode_encoder.rs +++ b/src/qrcode/encoder/qrcode_encoder.rs @@ -179,7 +179,9 @@ pub fn encode_with_hints( version = Version::getVersionForNumber(versionNumber)?; let bitsNeeded = calculateBitsNeeded(mode, &header_bits, &data_bits, version); if !willFit(bitsNeeded, version, &ec_level) { - return Err(Exceptions::writer_with("Data too big for requested version")); + return Err(Exceptions::writer_with( + "Data too big for requested version", + )); } } else { version = recommendVersion(&ec_level, mode, &header_bits, &data_bits)?; @@ -651,7 +653,11 @@ pub fn appendNumericBytes(content: &str, bits: &mut BitArray) -> Result<()> { let length = content.len(); let mut i = 0; while i < length { - let num1 = content.chars().nth(i).ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)? as u8 - b'0'; + let num1 = content + .chars() + .nth(i) + .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)? as u8 + - b'0'; if i + 2 < length { // Encode three numeric letters in ten bits. let num2 = content @@ -688,8 +694,12 @@ pub fn appendAlphanumericBytes(content: &str, bits: &mut BitArray) -> Result<()> let length = content.len(); let mut i = 0; while i < length { - let code1 = - getAlphanumericCode(content.chars().nth(i).ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)? as u32); + let code1 = getAlphanumericCode( + content + .chars() + .nth(i) + .ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)? as u32, + ); if code1 == -1 { return Err(Exceptions::WRITER); }