From 29a4040f2d39b38b9ae059ee82e7825ae29ba024 Mon Sep 17 00:00:00 2001 From: Henry Schimke Date: Fri, 30 Dec 2022 17:00:35 -0600 Subject: [PATCH] cleanup more warnings and deprecated function use --- src/client/result/CalendarParsedResult.rs | 8 ++- .../result/CalendarParsedResultTestCase.rs | 8 ++- .../result/ExpandedProductResultParser.rs | 4 +- .../result/ParsedReaderResultTestCase.rs | 18 +++-- src/common/bit_matrix.rs | 3 +- src/datamatrix/encoder/default_placement.rs | 1 + src/datamatrix/encoder/encoder_context.rs | 1 - src/datamatrix/encoder/high_level_encoder.rs | 1 + src/datamatrix/encoder/symbol_info.rs | 7 +- src/multi/multi_test_case.rs | 4 +- src/multi/qrcode/detector/multi_detector.rs | 2 +- src/oned/code_128_reader.rs | 2 +- src/oned/code_39_reader.rs | 2 +- src/oned/code_93_reader.rs | 2 +- src/oned/code_93_writer.rs | 6 +- src/oned/itf_reader.rs | 2 +- src/oned/multi_format_upc_ean_reader.rs | 2 +- .../decoders/abstract_decoder_test_utils.rs | 66 ++++++++++++------- .../expanded/decoders/ai_013103_decoder.rs | 6 +- .../decoders/ai_0132023203_decoder_test.rs | 4 +- .../expanded/decoders/ai_013x0x1x_decoder.rs | 54 +++++++-------- .../rss/expanded/decoders/any_ai_decoder.rs | 28 ++++---- .../rss/expanded/decoders/decoded_numeric.rs | 4 +- .../rss/expanded/decoders/field_parser.rs | 10 ++- src/oned/rss/expanded/rss_expanded_reader.rs | 4 +- src/oned/rss/rss_14_reader.rs | 8 +-- src/oned/upc_ean_extension_2_support.rs | 2 +- src/oned/upc_ean_extension_5_support.rs | 2 +- src/oned/upc_ean_extension_support.rs | 2 +- src/oned/upc_ean_reader.rs | 2 +- src/pdf417/decoder/detection_result.rs | 4 +- .../decoder/ec/error_correction_test_case.rs | 3 +- src/qrcode/decoder/mod.rs | 4 +- src/qrcode/encoder/encoder.rs | 1 - src/qrcode/encoder/minimal_encoder.rs | 2 +- src/qrcode/encoder/mod.rs | 8 +-- src/rxing_result_metadata.rs | 2 +- tests/pdf_417_blackbox_tests.rs | 2 +- 38 files changed, 158 insertions(+), 133 deletions(-) diff --git a/src/client/result/CalendarParsedResult.rs b/src/client/result/CalendarParsedResult.rs index 1a1203e..a2616c7 100644 --- a/src/client/result/CalendarParsedResult.rs +++ b/src/client/result/CalendarParsedResult.rs @@ -256,9 +256,11 @@ impl CalendarParsedRXingResult { // ? DateFormat.getDateInstance(DateFormat.MEDIUM) // : DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM); // return format.format(date); - NaiveDateTime::from_timestamp(date, 0) - .format(format_string) - .to_string() + if let Some(dtm) = NaiveDateTime::from_timestamp_opt(date, 0) { + dtm.format(format_string).to_string() + } else { + String::from("") + } } fn parseDurationMS(durationString: &str) -> i64 { diff --git a/src/client/result/CalendarParsedResultTestCase.rs b/src/client/result/CalendarParsedResultTestCase.rs index 7b16456..5fe9f34 100644 --- a/src/client/result/CalendarParsedResultTestCase.rs +++ b/src/client/result/CalendarParsedResultTestCase.rs @@ -250,8 +250,10 @@ fn assertEqualOrNaN(expected: f64, actual: f64) { } fn format_date_string(timestamp: i64, format_string: &str) -> String { - NaiveDateTime::from_timestamp(timestamp, 0) - .format(format_string) - .to_string() + if let Some(dtm) = NaiveDateTime::from_timestamp_opt(timestamp, 0) { + dtm.format(format_string).to_string() + } else { + String::from("") + } // DateTime::from(timestamp,0).with_timezone(Utc).format(format_string).to_string() } diff --git a/src/client/result/ExpandedProductResultParser.rs b/src/client/result/ExpandedProductResultParser.rs index 70693d1..ba5aaad 100644 --- a/src/client/result/ExpandedProductResultParser.rs +++ b/src/client/result/ExpandedProductResultParser.rs @@ -36,9 +36,7 @@ use std::collections::HashMap; use crate::BarcodeFormat; -use super::{ - ExpandedProductParsedRXingResult, ParsedClientResult, ResultParser, -}; +use super::{ExpandedProductParsedRXingResult, ParsedClientResult, ResultParser}; /** * Parses strings of digits that represent a RSS Extended code. diff --git a/src/client/result/ParsedReaderResultTestCase.rs b/src/client/result/ParsedReaderResultTestCase.rs index d4b890b..8485e27 100644 --- a/src/client/result/ParsedReaderResultTestCase.rs +++ b/src/client/result/ParsedReaderResultTestCase.rs @@ -27,7 +27,7 @@ // import java.util.Locale; // import java.util.TimeZone; -use chrono::{TimeZone, Utc}; +use chrono::{LocalResult, TimeZone, Utc}; use crate::{client::result::ParsedRXingResult, BarcodeFormat, RXingResult}; @@ -500,8 +500,11 @@ fn test_vevent() { } fn format_date(year: i32, month: u32, day: u32) -> String { - let dtm = Utc.ymd(year, month, day); - dtm.format("%F").to_string() + if let LocalResult::Single(dtm) = Utc.with_ymd_and_hms(year, month, day, 0, 0, 0) { + dtm.format("%F").to_string() + } else { + String::from("") + } // Calendar cal = Calendar.getInstance(); // cal.clear(); // cal.set(year, month - 1, day); @@ -509,8 +512,13 @@ fn format_date(year: i32, month: u32, day: u32) -> String { } fn format_time(year: i32, month: u32, day: u32, hour: u32, min: u32, sec: u32) -> String { - let dtm = Utc.ymd(year, month, day).and_hms(hour, min, sec); - dtm.format("%c").to_string() + if let LocalResult::Single(dtm) = Utc.with_ymd_and_hms(year, month, day, hour, min, sec) { + //Utc.ymd(year, month, day).and_hms(hour, min, sec); + + dtm.format("%c").to_string() + } else { + String::from("") + } // Calendar cal = Calendar.getInstance(); // cal.clear(); // cal.set(year, month - 1, day, hour, min, sec); diff --git a/src/common/bit_matrix.rs b/src/common/bit_matrix.rs index f371f24..ce3de26 100644 --- a/src/common/bit_matrix.rs +++ b/src/common/bit_matrix.rs @@ -81,6 +81,7 @@ impl BitMatrix { // bits = new int[rowSize * height]; } + #[allow(dead_code)] fn with_all_data(&self, width: u32, height: u32, rowSize: usize, bits: Vec) -> Self { Self { width, @@ -168,7 +169,7 @@ impl BitMatrix { if bitsPos > rowStartPos { //if rowLength == -1 { if first_run { - first_run = false; + // first_run = false; rowLength = bitsPos - rowStartPos; } else if bitsPos - rowStartPos != rowLength { return Err(Exceptions::IllegalArgumentException( diff --git a/src/datamatrix/encoder/default_placement.rs b/src/datamatrix/encoder/default_placement.rs index 9ef64e6..362ca14 100644 --- a/src/datamatrix/encoder/default_placement.rs +++ b/src/datamatrix/encoder/default_placement.rs @@ -224,6 +224,7 @@ impl DefaultPlacement { self.module(1, self.numcols as isize - 1, pos, 8); } + #[allow(dead_code)] fn toBitFieldStringArray(&self) -> Vec { let bits = self.getBits(); let numrows = self.getNumrows(); diff --git a/src/datamatrix/encoder/encoder_context.rs b/src/datamatrix/encoder/encoder_context.rs index f4ae76b..c101b39 100644 --- a/src/datamatrix/encoder/encoder_context.rs +++ b/src/datamatrix/encoder/encoder_context.rs @@ -20,7 +20,6 @@ use crate::{Dimension, Exceptions}; use super::{SymbolInfo, SymbolInfoLookup, SymbolShapeHint}; use encoding::{self, EncodingRef}; -use unicode_segmentation::UnicodeSegmentation; const ISO_8859_1_ENCODER: EncodingRef = encoding::all::ISO_8859_1; diff --git a/src/datamatrix/encoder/high_level_encoder.rs b/src/datamatrix/encoder/high_level_encoder.rs index 635ceb4..7b26406 100644 --- a/src/datamatrix/encoder/high_level_encoder.rs +++ b/src/datamatrix/encoder/high_level_encoder.rs @@ -24,6 +24,7 @@ use super::{ ASCIIEncoder, Base256Encoder, C40Encoder, EdifactEncoder, Encoder, EncoderContext, SymbolInfoLookup, SymbolShapeHint, TextEncoder, X12Encoder, }; +#[allow(dead_code)] const DEFAULT_ENCODING: EncodingRef = encoding::all::ISO_8859_1; /** diff --git a/src/datamatrix/encoder/symbol_info.rs b/src/datamatrix/encoder/symbol_info.rs index 1271a8c..2625a29 100644 --- a/src/datamatrix/encoder/symbol_info.rs +++ b/src/datamatrix/encoder/symbol_info.rs @@ -354,13 +354,12 @@ impl<'a> SymbolInfoLookup<'a> { } mod tests { - use crate::{ - datamatrix::encoder::{SymbolInfo, SymbolShapeHint}, - Dimension, - }; + + use crate::{datamatrix::encoder::SymbolShapeHint, Dimension}; use super::SymbolInfoLookup; + #[allow(dead_code)] const LOOKUP: SymbolInfoLookup = SymbolInfoLookup::new(); /** diff --git a/src/multi/multi_test_case.rs b/src/multi/multi_test_case.rs index 92c9149..645c2d6 100644 --- a/src/multi/multi_test_case.rs +++ b/src/multi/multi_test_case.rs @@ -17,8 +17,8 @@ use std::{collections::HashSet, path::PathBuf, rc::Rc}; use crate::{ - common::HybridBinarizer, BarcodeFormat, BinaryBitmap, - BufferedImageLuminanceSource, MultiFormatReader, + common::HybridBinarizer, BarcodeFormat, BinaryBitmap, BufferedImageLuminanceSource, + MultiFormatReader, }; use super::{GenericMultipleBarcodeReader, MultipleBarcodeReader}; diff --git a/src/multi/qrcode/detector/multi_detector.rs b/src/multi/qrcode/detector/multi_detector.rs index f90b9f9..2c5bd88 100644 --- a/src/multi/qrcode/detector/multi_detector.rs +++ b/src/multi/qrcode/detector/multi_detector.rs @@ -15,7 +15,7 @@ */ use crate::{ - common::{BitMatrix}, + common::BitMatrix, qrcode::detector::{Detector, QRCodeDetectorResult}, DecodeHintType, DecodeHintValue, DecodingHintDictionary, Exceptions, }; diff --git a/src/oned/code_128_reader.rs b/src/oned/code_128_reader.rs index e30ed88..ac91484 100644 --- a/src/oned/code_128_reader.rs +++ b/src/oned/code_128_reader.rs @@ -405,7 +405,7 @@ impl Code128Reader { return Ok([patternStart, i, bestMatch as usize]); } patternStart += (counters[0] + counters[1]) as usize; - + counters.copy_within(2..(counterPosition - 1 + 2), 0); // System.arraycopy(counters, 2, counters, 0, counterPosition - 1); counters[counterPosition - 1] = 0; diff --git a/src/oned/code_39_reader.rs b/src/oned/code_39_reader.rs index 7a193ea..bfe8ff0 100644 --- a/src/oned/code_39_reader.rs +++ b/src/oned/code_39_reader.rs @@ -229,7 +229,7 @@ impl Code39Reader { // return new int[]{patternStart, i}; } patternStart += (counters[0] + counters[1]) as usize; - + counters.copy_within(2..(counterPosition - 1 + 2), 0); // System.arraycopy(counters, 2, counters, 0, counterPosition - 1); counters[counterPosition - 1] = 0; diff --git a/src/oned/code_93_reader.rs b/src/oned/code_93_reader.rs index e66e11c..eef861f 100644 --- a/src/oned/code_93_reader.rs +++ b/src/oned/code_93_reader.rs @@ -171,7 +171,7 @@ impl Code93Reader { return Ok([patternStart, i]); } patternStart += (theCounters[0] + theCounters[1]) as usize; - + theCounters.copy_within(2..(counterPosition - 1 + 2), 0); // System.arraycopy(theCounters, 2, theCounters, 0, counterPosition - 1); theCounters[counterPosition - 1] = 0; diff --git a/src/oned/code_93_writer.rs b/src/oned/code_93_writer.rs index c85ea42..b2fed82 100644 --- a/src/oned/code_93_writer.rs +++ b/src/oned/code_93_writer.rs @@ -218,11 +218,7 @@ impl Code93Writer { */ #[cfg(test)] mod Code93WriterTestCase { - use crate::{ - common::BitMatrixTestCase, - oned::{Code93Writer}, - BarcodeFormat, Writer, - }; + use crate::{common::BitMatrixTestCase, oned::Code93Writer, BarcodeFormat, Writer}; #[test] fn testEncode() { diff --git a/src/oned/itf_reader.rs b/src/oned/itf_reader.rs index ec30bab..d6d6e0b 100644 --- a/src/oned/itf_reader.rs +++ b/src/oned/itf_reader.rs @@ -384,7 +384,7 @@ impl ITFReader { return Ok([patternStart, x]); } patternStart += (counters[0] + counters[1]) as usize; - + counters.copy_within(2..(counterPosition - 1 + 2), 0); // System.arraycopy(counters, 2, counters, 0, counterPosition - 1); counters[counterPosition - 1] = 0; diff --git a/src/oned/multi_format_upc_ean_reader.rs b/src/oned/multi_format_upc_ean_reader.rs index 2772e3d..2557dd3 100644 --- a/src/oned/multi_format_upc_ean_reader.rs +++ b/src/oned/multi_format_upc_ean_reader.rs @@ -22,9 +22,9 @@ use crate::Reader; use super::EAN13Reader; use super::EAN8Reader; -use super::STAND_IN; use super::UPCAReader; use super::UPCEReader; +use super::STAND_IN; use super::{OneDReader, UPCEANReader}; /** diff --git a/src/oned/rss/expanded/decoders/abstract_decoder_test_utils.rs b/src/oned/rss/expanded/decoders/abstract_decoder_test_utils.rs index 9fe2c0a..ee30e2f 100644 --- a/src/oned/rss/expanded/decoders/abstract_decoder_test_utils.rs +++ b/src/oned/rss/expanded/decoders/abstract_decoder_test_utils.rs @@ -24,44 +24,62 @@ * http://www.piramidepse.com/ */ -use crate::oned::rss::expanded::{ - binary_util, - decoders::{abstract_expanded_decoder::createDecoder, AbstractExpandedDecoder}, -}; +use crate::oned::rss::expanded::{binary_util, decoders::abstract_expanded_decoder::createDecoder}; /** * @author Pablo Orduña, University of Deusto (pablo.orduna@deusto.es) */ -pub const numeric10: &str = "..X..XX"; -pub const numeric12: &str = "..X.X.X"; -pub const numeric1FNC1: &str = "..XXX.X"; +#[allow(dead_code)] +pub const NUMERIC10: &str = "..X..XX"; +#[allow(dead_code)] +pub const NUMERIC12: &str = "..X.X.X"; +#[allow(dead_code)] +pub const NUMERIC1_FNC1: &str = "..XXX.X"; // static final String numericFNC11 = "XXX.XXX"; -pub const numeric2alpha: &str = "...."; +#[allow(dead_code)] +pub const NUMERIC2ALPHA: &str = "...."; -pub const alphaA: &str = "X....."; -pub const alphaFNC1: &str = ".XXXX"; -pub const alpha2numeric: &str = "..."; -pub const alpha2isoiec646: &str = "..X.."; +#[allow(dead_code)] +pub const ALPHA_A: &str = "X....."; +#[allow(dead_code)] +pub const ALPHA_FNC1: &str = ".XXXX"; +#[allow(dead_code)] +pub const ALPHA2NUMERIC: &str = "..."; +#[allow(dead_code)] +pub const ALPHA2ISOIEC646: &str = "..X.."; -pub const i646B: &str = "X.....X"; -pub const i646C: &str = "X....X."; -pub const i646FNC1: &str = ".XXXX"; -pub const isoiec6462alpha: &str = "..X.."; +#[allow(dead_code)] +pub const I646_B: &str = "X.....X"; +#[allow(dead_code)] +pub const I646_C: &str = "X....X."; +#[allow(dead_code)] +pub const I646_FNC1: &str = ".XXXX"; +#[allow(dead_code)] +pub const ISOIEC6462ALPHA: &str = "..X.."; -pub const compressedGtin900123456798908: &str = ".........X..XXX.X.X.X...XX.XXXXX.XXXX.X."; -pub const compressedGtin900000000000008: &str = "........................................"; +#[allow(dead_code)] +pub const COMPRESSED_GTIN900123456798908: &str = ".........X..XXX.X.X.X...XX.XXXXX.XXXX.X."; +#[allow(dead_code)] +pub const COMPRESSED_GTIN900000000000008: &str = "........................................"; -pub const compressed15bitWeight1750: &str = "....XX.XX.X.XX."; -pub const compressed15bitWeight11750: &str = ".X.XX.XXXX..XX."; -pub const compressed15bitWeight0: &str = "..............."; +#[allow(dead_code)] +pub const COMPRESSED15BIT_WEIGHT1750: &str = "....XX.XX.X.XX."; +#[allow(dead_code)] +pub const COMPRESSED15BIT_WEIGHT11750: &str = ".X.XX.XXXX..XX."; +#[allow(dead_code)] +pub const COMPRESSED15BIT_WEIGHT0: &str = "..............."; -pub const compressed20bitWeight1750: &str = ".........XX.XX.X.XX."; +#[allow(dead_code)] +pub const COMPRESSED20BIT_WEIGHT1750: &str = ".........XX.XX.X.XX."; -pub const compressedDateMarch12th2010: &str = "....XXXX.X..XX.."; -pub const compressedDateEnd: &str = "X..X.XX........."; +#[allow(dead_code)] +pub const COMPRESSED_DATE_MARCH12TH2010: &str = "....XXXX.X..XX.."; +#[allow(dead_code)] +pub const COMPRESSED_DATE_END: &str = "X..X.XX........."; +#[allow(dead_code)] pub fn assertCorrectBinaryString(binaryString: &str, expectedNumber: &str) { let binary = binary_util::buildBitArrayFromStringWithoutSpaces(binaryString).expect("built"); diff --git a/src/oned/rss/expanded/decoders/ai_013103_decoder.rs b/src/oned/rss/expanded/decoders/ai_013103_decoder.rs index f5fb620..dd34941 100644 --- a/src/oned/rss/expanded/decoders/ai_013103_decoder.rs +++ b/src/oned/rss/expanded/decoders/ai_013103_decoder.rs @@ -84,7 +84,7 @@ mod AI013103DecoderTest { fn test0131031() { let data = format!( "{}{}{}", - HEADER, compressedGtin900123456798908, compressed15bitWeight1750 + HEADER, COMPRESSED_GTIN900123456798908, COMPRESSED15BIT_WEIGHT1750 ); let expected = "(01)90012345678908(3103)001750"; assertCorrectBinaryString(&data, expected); @@ -94,7 +94,7 @@ mod AI013103DecoderTest { fn test0131032() { let data = format!( "{}{}{}", - HEADER, compressedGtin900000000000008, compressed15bitWeight0 + HEADER, COMPRESSED_GTIN900000000000008, COMPRESSED15BIT_WEIGHT0 ); let expected = "(01)90000000000003(3103)000000"; assertCorrectBinaryString(&data, expected); @@ -105,7 +105,7 @@ mod AI013103DecoderTest { fn test013103invalid() { let data = format!( "{}{}{}..", - HEADER, compressedGtin900123456798908, compressed15bitWeight1750 + 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 078f0d9..25733f7 100644 --- a/src/oned/rss/expanded/decoders/ai_0132023203_decoder_test.rs +++ b/src/oned/rss/expanded/decoders/ai_0132023203_decoder_test.rs @@ -36,7 +36,7 @@ const HEADER: &str = "..X.X"; fn test0132021() { let data = format!( "{}{}{}", - HEADER, compressedGtin900123456798908, compressed15bitWeight1750 + HEADER, COMPRESSED_GTIN900123456798908, COMPRESSED15BIT_WEIGHT1750 ); let expected = "(01)90012345678908(3202)001750"; @@ -47,7 +47,7 @@ fn test0132021() { fn test0132031() { let data = format!( "{}{}{}", - HEADER, compressedGtin900123456798908, compressed15bitWeight11750 + HEADER, COMPRESSED_GTIN900123456798908, COMPRESSED15BIT_WEIGHT11750 ); let expected = "(01)90012345678908(3203)001750"; diff --git a/src/oned/rss/expanded/decoders/ai_013x0x1x_decoder.rs b/src/oned/rss/expanded/decoders/ai_013x0x1x_decoder.rs index 5a65ad7..fb764de 100644 --- a/src/oned/rss/expanded/decoders/ai_013x0x1x_decoder.rs +++ b/src/oned/rss/expanded/decoders/ai_013x0x1x_decoder.rs @@ -153,9 +153,9 @@ mod AI013X0X1XDecoderTest { let data = format!( "{}{}{}{}", HEADER310X11, - compressedGtin900123456798908, - compressed20bitWeight1750, - compressedDateEnd + COMPRESSED_GTIN900123456798908, + COMPRESSED20BIT_WEIGHT1750, + COMPRESSED_DATE_END ); let expected = "(01)90012345678908(3100)001750"; @@ -167,9 +167,9 @@ mod AI013X0X1XDecoderTest { let data = format!( "{}{}{}{}", HEADER310X11, - compressedGtin900123456798908, - compressed20bitWeight1750, - compressedDateMarch12th2010 + COMPRESSED_GTIN900123456798908, + COMPRESSED20BIT_WEIGHT1750, + COMPRESSED_DATE_MARCH12TH2010 ); let expected = "(01)90012345678908(3100)001750(11)100312"; @@ -181,9 +181,9 @@ mod AI013X0X1XDecoderTest { let data = format!( "{}{}{}{}", HEADER320X11, - compressedGtin900123456798908, - compressed20bitWeight1750, - compressedDateMarch12th2010 + COMPRESSED_GTIN900123456798908, + COMPRESSED20BIT_WEIGHT1750, + COMPRESSED_DATE_MARCH12TH2010 ); let expected = "(01)90012345678908(3200)001750(11)100312"; @@ -195,9 +195,9 @@ mod AI013X0X1XDecoderTest { let data = format!( "{}{}{}{}", HEADER310X13, - compressedGtin900123456798908, - compressed20bitWeight1750, - compressedDateMarch12th2010 + COMPRESSED_GTIN900123456798908, + COMPRESSED20BIT_WEIGHT1750, + COMPRESSED_DATE_MARCH12TH2010 ); let expected = "(01)90012345678908(3100)001750(13)100312"; @@ -209,9 +209,9 @@ mod AI013X0X1XDecoderTest { let data = format!( "{}{}{}{}", HEADER320X13, - compressedGtin900123456798908, - compressed20bitWeight1750, - compressedDateMarch12th2010 + COMPRESSED_GTIN900123456798908, + COMPRESSED20BIT_WEIGHT1750, + COMPRESSED_DATE_MARCH12TH2010 ); let expected = "(01)90012345678908(3200)001750(13)100312"; @@ -223,9 +223,9 @@ mod AI013X0X1XDecoderTest { let data = format!( "{}{}{}{}", HEADER310X15, - compressedGtin900123456798908, - compressed20bitWeight1750, - compressedDateMarch12th2010 + COMPRESSED_GTIN900123456798908, + COMPRESSED20BIT_WEIGHT1750, + COMPRESSED_DATE_MARCH12TH2010 ); let expected = "(01)90012345678908(3100)001750(15)100312"; @@ -237,9 +237,9 @@ mod AI013X0X1XDecoderTest { let data = format!( "{}{}{}{}", HEADER320X15, - compressedGtin900123456798908, - compressed20bitWeight1750, - compressedDateMarch12th2010 + COMPRESSED_GTIN900123456798908, + COMPRESSED20BIT_WEIGHT1750, + COMPRESSED_DATE_MARCH12TH2010 ); let expected = "(01)90012345678908(3200)001750(15)100312"; @@ -251,9 +251,9 @@ mod AI013X0X1XDecoderTest { let data = format!( "{}{}{}{}", HEADER310X17, - compressedGtin900123456798908, - compressed20bitWeight1750, - compressedDateMarch12th2010 + COMPRESSED_GTIN900123456798908, + COMPRESSED20BIT_WEIGHT1750, + COMPRESSED_DATE_MARCH12TH2010 ); let expected = "(01)90012345678908(3100)001750(17)100312"; @@ -265,9 +265,9 @@ mod AI013X0X1XDecoderTest { let data = format!( "{}{}{}{}", HEADER320X17, - compressedGtin900123456798908, - compressed20bitWeight1750, - compressedDateMarch12th2010 + COMPRESSED_GTIN900123456798908, + COMPRESSED20BIT_WEIGHT1750, + COMPRESSED_DATE_MARCH12TH2010 ); let expected = "(01)90012345678908(3200)001750(17)100312"; diff --git a/src/oned/rss/expanded/decoders/any_ai_decoder.rs b/src/oned/rss/expanded/decoders/any_ai_decoder.rs index ca0024e..0df2a63 100644 --- a/src/oned/rss/expanded/decoders/any_ai_decoder.rs +++ b/src/oned/rss/expanded/decoders/any_ai_decoder.rs @@ -71,7 +71,7 @@ mod AnyAIDecoderTest { fn testAnyAIDecoder1() { let data = format!( "{}{}{}{}{}{}{}", - HEADER, numeric10, numeric12, numeric2alpha, alphaA, alpha2numeric, numeric12 + HEADER, NUMERIC10, NUMERIC12, NUMERIC2ALPHA, ALPHA_A, ALPHA2NUMERIC, NUMERIC12 ); let expected = "(10)12A12"; @@ -82,7 +82,7 @@ mod AnyAIDecoderTest { fn testAnyAIDecoder2() { let data = format!( "{}{}{}{}{}{}{}", - HEADER, numeric10, numeric12, numeric2alpha, alphaA, alpha2isoiec646, i646B + HEADER, NUMERIC10, NUMERIC12, NUMERIC2ALPHA, ALPHA_A, ALPHA2ISOIEC646, I646_B ); let expected = "(10)12AB"; @@ -94,15 +94,15 @@ mod AnyAIDecoderTest { let data = format!( "{}{}{}{}{}{}{}{}{}{}", HEADER, - numeric10, - numeric2alpha, - alpha2isoiec646, - i646B, - i646C, - isoiec6462alpha, - alphaA, - alpha2numeric, - numeric10 + NUMERIC10, + NUMERIC2ALPHA, + ALPHA2ISOIEC646, + I646_B, + I646_C, + ISOIEC6462ALPHA, + ALPHA_A, + ALPHA2NUMERIC, + NUMERIC10 ); let expected = "(10)BCA10"; @@ -111,7 +111,7 @@ mod AnyAIDecoderTest { #[test] fn testAnyAIDecodernumericFNC1secondDigit() { - let data = format!("{}{}{}", HEADER, numeric10, numeric1FNC1); + let data = format!("{}{}{}", HEADER, NUMERIC10, NUMERIC1_FNC1); let expected = "(10)1"; assertCorrectBinaryString(&data, expected); @@ -121,7 +121,7 @@ mod AnyAIDecoderTest { fn testAnyAIDecoderalphaFNC1() { let data = format!( "{}{}{}{}{}", - HEADER, numeric10, numeric2alpha, alphaA, alphaFNC1 + HEADER, NUMERIC10, NUMERIC2ALPHA, ALPHA_A, ALPHA_FNC1 ); let expected = "(10)A"; @@ -132,7 +132,7 @@ mod AnyAIDecoderTest { fn testAnyAIDecoder646FNC1() { let data = format!( "{}{}{}{}{}{}{}", - HEADER, numeric10, numeric2alpha, alphaA, isoiec6462alpha, i646B, i646FNC1 + HEADER, NUMERIC10, NUMERIC2ALPHA, ALPHA_A, ISOIEC6462ALPHA, I646_B, I646_FNC1 ); let expected = "(10)AB"; diff --git a/src/oned/rss/expanded/decoders/decoded_numeric.rs b/src/oned/rss/expanded/decoders/decoded_numeric.rs index 5e6c552..291e4fd 100644 --- a/src/oned/rss/expanded/decoders/decoded_numeric.rs +++ b/src/oned/rss/expanded/decoders/decoded_numeric.rs @@ -48,7 +48,9 @@ impl DecodedNumeric { pub fn new(newPosition: usize, firstDigit: u32, secondDigit: u32) -> Result { // super(newPosition); - if /*firstDigit < 0 ||*/ firstDigit > 10 || /*secondDigit < 0 ||*/ secondDigit > 10 { + if + /*firstDigit < 0 ||*/ + firstDigit > 10 || /*secondDigit < 0 ||*/ secondDigit > 10 { return Err(Exceptions::FormatException( ".getFormatInstance();".to_owned(), )); diff --git a/src/oned/rss/expanded/decoders/field_parser.rs b/src/oned/rss/expanded/decoders/field_parser.rs index 301ed15..64d7e60 100644 --- a/src/oned/rss/expanded/decoders/field_parser.rs +++ b/src/oned/rss/expanded/decoders/field_parser.rs @@ -23,18 +23,16 @@ * * http://www.piramidepse.com/ */ - +/** + * @author Pablo Orduña, University of Deusto (pablo.orduna@deusto.es) + * @author Eduardo Castillejo, University of Deusto (eduardo.castillejo@deusto.es) + */ use std::collections::HashMap; use crate::Exceptions; use lazy_static::lazy_static; -/** - * @author Pablo Orduña, University of Deusto (pablo.orduna@deusto.es) - * @author Eduardo Castillejo, University of Deusto (eduardo.castillejo@deusto.es) - */ - lazy_static! { static ref TWO_DIGIT_DATA_LENGTH : HashMap = { diff --git a/src/oned/rss/expanded/rss_expanded_reader.rs b/src/oned/rss/expanded/rss_expanded_reader.rs index 8f7661f..c7bf68a 100644 --- a/src/oned/rss/expanded/rss_expanded_reader.rs +++ b/src/oned/rss/expanded/rss_expanded_reader.rs @@ -27,7 +27,7 @@ use std::collections::HashMap; use crate::{ - common::{detector::MathUtils, BitArray}, + common::BitArray, oned::{ recordPattern, recordPatternInReverse, rss::{ @@ -287,6 +287,7 @@ impl RSSExpandedReader { [45, 135, 194, 160, 58, 174, 100, 89], ]; + #[allow(dead_code)] const MAX_PAIRS: usize = 11; // Not private for testing @@ -536,6 +537,7 @@ impl RSSExpandedReader { // Only used for unit testing #[cfg(test)] + #[allow(dead_code)] pub(crate) fn getRowsMut(&mut self) -> &mut [ExpandedRow] { &mut self.rows } diff --git a/src/oned/rss/rss_14_reader.rs b/src/oned/rss/rss_14_reader.rs index 6baa7e7..760b5c7 100644 --- a/src/oned/rss/rss_14_reader.rs +++ b/src/oned/rss/rss_14_reader.rs @@ -17,7 +17,7 @@ use std::collections::HashMap; use crate::{ - common::{detector::MathUtils, BitArray}, + common::BitArray, oned::{one_d_reader, OneDReader}, BarcodeFormat, DecodeHintType, DecodingHintDictionary, Exceptions, RXingResult, RXingResultMetadataType, RXingResultMetadataValue, RXingResultPoint, Reader, ResultPoint, @@ -250,7 +250,7 @@ impl RSS14Reader { row: &BitArray, right: bool, rowNumber: u32, - hints: &DecodingHintDictionary, + _hints: &DecodingHintDictionary, ) -> Option { let pos_pair = || -> Result { let startEnd = self.findFinderPattern(row, right)?; @@ -464,9 +464,9 @@ impl RSS14Reader { } firstElementStart += 1; let firstCounter = startEnd[0] - firstElementStart as usize; - let counters = &mut self.decodeFinderCounters; + let counters = &mut self.decodeFinderCounters; let counter_len = counters.len(); - + counters.copy_within(..counter_len - 1, 1); // Make 'counters' hold 1-4 // let counters = self.getDecodeFinderCounters(); diff --git a/src/oned/upc_ean_extension_2_support.rs b/src/oned/upc_ean_extension_2_support.rs index 3b12637..9efab6e 100644 --- a/src/oned/upc_ean_extension_2_support.rs +++ b/src/oned/upc_ean_extension_2_support.rs @@ -21,7 +21,7 @@ use crate::{ RXingResultMetadataValue, RXingResultPoint, }; -use super::{upc_ean_reader, STAND_IN, UPCEANReader}; +use super::{upc_ean_reader, UPCEANReader, STAND_IN}; /** * @see UPCEANExtension5Support diff --git a/src/oned/upc_ean_extension_5_support.rs b/src/oned/upc_ean_extension_5_support.rs index dd34a0f..1c13b48 100644 --- a/src/oned/upc_ean_extension_5_support.rs +++ b/src/oned/upc_ean_extension_5_support.rs @@ -21,7 +21,7 @@ use crate::{ RXingResultMetadataValue, RXingResultPoint, }; -use super::{upc_ean_reader, STAND_IN, UPCEANReader}; +use super::{upc_ean_reader, UPCEANReader, STAND_IN}; /** * @see UPCEANExtension2Support diff --git a/src/oned/upc_ean_extension_support.rs b/src/oned/upc_ean_extension_support.rs index fc28209..d32a9ff 100644 --- a/src/oned/upc_ean_extension_support.rs +++ b/src/oned/upc_ean_extension_support.rs @@ -16,7 +16,7 @@ use crate::{common::BitArray, Exceptions, RXingResult}; -use super::{STAND_IN, UPCEANExtension2Support, UPCEANExtension5Support, UPCEANReader}; +use super::{UPCEANExtension2Support, UPCEANExtension5Support, UPCEANReader, STAND_IN}; pub struct UPCEANExtensionSupport { twoSupport: UPCEANExtension2Support, diff --git a/src/oned/upc_ean_reader.rs b/src/oned/upc_ean_reader.rs index d5ae703..5a1bdcc 100644 --- a/src/oned/upc_ean_reader.rs +++ b/src/oned/upc_ean_reader.rs @@ -442,7 +442,7 @@ pub trait UPCEANReader: OneDReader { return Ok([patternStart, x]); } patternStart += (counters[0] + counters[1]) as usize; - + counters.copy_within(2..(counterPosition - 1 + 2), 0); // System.arraycopy(counters, 2, counters, 0, counterPosition - 1); counters[counterPosition - 1] = 0; diff --git a/src/pdf417/decoder/detection_result.rs b/src/pdf417/decoder/detection_result.rs index c891462..b9412db 100644 --- a/src/pdf417/decoder/detection_result.rs +++ b/src/pdf417/decoder/detection_result.rs @@ -19,8 +19,8 @@ use std::{fmt::Display, rc::Rc}; use crate::pdf417::pdf_417_common; use super::{ - BarcodeMetadata, BoundingBox, Codeword, - DetectionRXingResultColumnTrait, DetectionRXingResultRowIndicatorColumn, + BarcodeMetadata, BoundingBox, Codeword, DetectionRXingResultColumnTrait, + DetectionRXingResultRowIndicatorColumn, }; const ADJUST_ROW_NUMBER_SKIP: u32 = 2; diff --git a/src/pdf417/decoder/ec/error_correction_test_case.rs b/src/pdf417/decoder/ec/error_correction_test_case.rs index e467c93..6903f7f 100644 --- a/src/pdf417/decoder/ec/error_correction_test_case.rs +++ b/src/pdf417/decoder/ec/error_correction_test_case.rs @@ -16,7 +16,7 @@ use rand::Rng; -use crate::{ Exceptions}; +use crate::Exceptions; use super::{ abstract_error_correction_test_case::{corrupt, getRandom}, @@ -56,7 +56,6 @@ fn testNoError() { #[test] fn testExplicitError() { - for i in 0..PDF417_TEST_WITH_EC.len() { // for (int i = 0; i < PDF417_TEST_WITH_EC.length; i++) { let mut received = PDF417_TEST_WITH_EC.clone(); diff --git a/src/qrcode/decoder/mod.rs b/src/qrcode/decoder/mod.rs index d559a37..e8c8696 100644 --- a/src/qrcode/decoder/mod.rs +++ b/src/qrcode/decoder/mod.rs @@ -9,8 +9,6 @@ mod mode; mod qr_code_decoder_meta_data; mod version; -#[cfg(test)] -mod data_mask_testcase; #[cfg(test)] mod DecodedBitStreamParserTestCase; #[cfg(test)] @@ -21,6 +19,8 @@ mod FormatInformationTestCase; mod ModeTestCase; #[cfg(test)] mod VersionTestCase; +#[cfg(test)] +mod data_mask_testcase; pub use bit_matrix_parser::*; pub use data_block::*; diff --git a/src/qrcode/encoder/encoder.rs b/src/qrcode/encoder/encoder.rs index 5c9dc5b..f8fe14a 100644 --- a/src/qrcode/encoder/encoder.rs +++ b/src/qrcode/encoder/encoder.rs @@ -17,7 +17,6 @@ * @author satorux@google.com (Satoru Takabayashi) - creator * @author dswitkin@google.com (Daniel Switkin) - ported from C++ */ - use std::collections::HashMap; use encoding::EncodingRef; diff --git a/src/qrcode/encoder/minimal_encoder.rs b/src/qrcode/encoder/minimal_encoder.rs index 485c735..25f6e7b 100644 --- a/src/qrcode/encoder/minimal_encoder.rs +++ b/src/qrcode/encoder/minimal_encoder.rs @@ -713,7 +713,7 @@ impl Edge { // } size }, - _encoders : encoders, + _encoders: encoders, } // this.mode = mode; // this.fromPosition = fromPosition; diff --git a/src/qrcode/encoder/mod.rs b/src/qrcode/encoder/mod.rs index ea3e56e..dd7ff38 100644 --- a/src/qrcode/encoder/mod.rs +++ b/src/qrcode/encoder/mod.rs @@ -11,13 +11,13 @@ pub use byte_matrix::*; pub use minimal_encoder::*; pub use qr_code::*; -#[cfg(test)] -mod bit_vector_testcase; #[cfg(test)] mod EncoderTestCase; #[cfg(test)] mod MaskUtilTestCase; #[cfg(test)] -mod matrix_util_testcase; -#[cfg(test)] mod QRCodeTestCase; +#[cfg(test)] +mod bit_vector_testcase; +#[cfg(test)] +mod matrix_util_testcase; diff --git a/src/rxing_result_metadata.rs b/src/rxing_result_metadata.rs index 5e081ec..ba0aa25 100644 --- a/src/rxing_result_metadata.rs +++ b/src/rxing_result_metadata.rs @@ -16,7 +16,7 @@ //package com.google.zxing; -use std::{ rc::Rc}; +use std::rc::Rc; use crate::pdf417::PDF417RXingResultMetadata; diff --git a/tests/pdf_417_blackbox_tests.rs b/tests/pdf_417_blackbox_tests.rs index 2d544c8..59e6eae 100644 --- a/tests/pdf_417_blackbox_tests.rs +++ b/tests/pdf_417_blackbox_tests.rs @@ -1,4 +1,4 @@ -use rxing::{MultiFormatReader}; +use rxing::MultiFormatReader; mod common;