clippy --fix && fmt

benches/benchmarks.rs

@@ -3,6 +3,7 @@ use rxing::aztec::AztecReader;
 use rxing::common::HybridBinarizer;
 use rxing::datamatrix::DataMatrixReader;
 use rxing::maxicode::MaxiCodeReader;
+use rxing::multi::{GenericMultipleBarcodeReader, MultipleBarcodeReader};
 use rxing::oned::rss::expanded::RSSExpandedReader;
 use rxing::oned::rss::RSS14Reader;
 use rxing::oned::{
@@ -11,10 +12,9 @@ use rxing::oned::{
 };
 use rxing::pdf417::PDF417Reader;
 use rxing::qrcode::QRCodeReader;
+use rxing::MultiFormatReader;
 use rxing::{BinaryBitmap, BufferedImageLuminanceSource, Reader};
 use std::path::Path;
-use rxing::multi::{GenericMultipleBarcodeReader, MultipleBarcodeReader};
-use rxing::MultiFormatReader;
 
 fn get_image(
     path: impl AsRef<Path>,

src/aztec/decoder.rs

@@ -19,7 +19,7 @@ use crate::{
         reedsolomon::{
             get_predefined_genericgf, GenericGFRef, PredefinedGenericGF, ReedSolomonDecoder,
         },
-        BitMatrix, CharacterSet, DecoderRXingResult, DetectorRXingResult, Result, Eci,
+        BitMatrix, CharacterSet, DecoderRXingResult, DetectorRXingResult, Eci, Result,
     },
     exceptions::Exceptions,
 };

src/aztec/encoder/state.rs

@@ -17,7 +17,7 @@
 use std::fmt;
 
 use crate::{
-    common::{BitArray, CharacterSet, Result, Eci},
+    common::{BitArray, CharacterSet, Eci, Result},
     exceptions::Exceptions,
 };
 

src/common/character_set.rs

@@ -278,9 +278,9 @@ impl CharacterSet {
             "iso-8859-3" => Some(CharacterSet::ISO8859_3),
             "iso-8859-4" => Some(CharacterSet::ISO8859_4),
             "iso-8859-5" => Some(CharacterSet::ISO8859_5),
-            "ISO-8859-6" => Some(CharacterSet::ISO8859_6),
+            "iso-8859-6" => Some(CharacterSet::ISO8859_6),
             "iso-8859-7" => Some(CharacterSet::ISO8859_7),
-            "ISO-8859-8" => Some(CharacterSet::ISO8859_8),
+            "iso-8859-8" => Some(CharacterSet::ISO8859_8),
             "iso-8859-9" => Some(CharacterSet::ISO8859_9),
             "ISO-8859-10" => Some(CharacterSet::ISO8859_10),
             "ISO-8859-11" => Some(CharacterSet::ISO8859_11),
@@ -313,7 +313,10 @@ impl CharacterSet {
             use codepage_437::ToCp437;
             use codepage_437::CP437_CONTROL;
 
-             input.to_cp437(&CP437_CONTROL).map(|data| data.to_vec()).map_err(|e| Exceptions::format_with(format!("{e:?}")))
+            input
+                .to_cp437(&CP437_CONTROL)
+                .map(|data| data.to_vec())
+                .map_err(|e| Exceptions::format_with(format!("{e:?}")))
         } else {
             self.get_base_encoder()
                 .encode(input, encoding::EncoderTrap::Strict)

src/datamatrix/decoder/decoded_bit_stream_parser.rs

@@ -15,7 +15,7 @@
  */
 
 use crate::{
-    common::{BitSource, CharacterSet, DecoderRXingResult, ECIStringBuilder, Result, Eci},
+    common::{BitSource, CharacterSet, DecoderRXingResult, ECIStringBuilder, Eci, Result},
     Exceptions,
 };
 
@@ -751,7 +751,9 @@ fn decodeECISegment(bits: &mut BitSource, result: &mut ECIStringBuilder) -> Resu
 
     let thirdByte = bits.readBits(8)?;
 
-    result.appendECI(Eci::from((firstByte - 192) * 64516 + 16383 + (secondByte - 1) * 254 + thirdByte - 1))?;
+    result.appendECI(Eci::from(
+        (firstByte - 192) * 64516 + 16383 + (secondByte - 1) * 254 + thirdByte - 1,
+    ))?;
     Ok((firstByte - 192) * 64516 + 16383 + (secondByte - 1) * 254 + thirdByte - 1 > 900)
 }
 

src/datamatrix/encoder/minimal_encoder.rs

@@ -17,7 +17,7 @@
 use std::{fmt, rc::Rc};
 
 use crate::{
-    common::{CharacterSet, ECIInput, MinimalECIInput, Result, Eci},
+    common::{CharacterSet, ECIInput, Eci, MinimalECIInput, Result},
     Exceptions,
 };
 

src/pdf417/decoder/decoded_bit_stream_parser.rs

@@ -19,7 +19,7 @@ use num::{self, bigint::ToBigUint, BigUint};
 use std::rc::Rc;
 
 use crate::{
-    common::{DecoderRXingResult, ECIStringBuilder, Result, Eci},
+    common::{DecoderRXingResult, ECIStringBuilder, Eci, Result},
     pdf417::PDF417RXingResultMetadata,
     Exceptions,
 };

src/pdf417/encoder/pdf_417_high_level_encoder.rs

@@ -21,7 +21,7 @@
 use std::{any::TypeId, fmt::Display, str::FromStr};
 
 use crate::{
-    common::{CharacterSet, ECIInput, MinimalECIInput, Result, Eci},
+    common::{CharacterSet, ECIInput, Eci, MinimalECIInput, Result},
     Exceptions,
 };
 
@@ -908,12 +908,7 @@ mod PDF417EncoderTestCase {
 
     #[test]
     fn testEncodeNumeric() {
-        let encoded = encodeHighLevel(
+        let encoded = encodeHighLevel("1234", Compaction::NUMERIC, Some(CharacterSet::UTF8), false)
-            "1234",
-            Compaction::NUMERIC,
-            Some(CharacterSet::UTF8),
-            false,
-        )
             .expect("encode");
         assert_eq!("\u{039f}\u{001A}\u{0386}\u{C}\u{01b2}", encoded);
         // converted \f to \u{0046}

src/qrcode/decoder/decoded_bit_stream_parser.rs

@@ -15,7 +15,7 @@
  */
 
 use crate::{
-    common::{BitSource, CharacterSet, DecoderRXingResult, Result, StringUtils, Eci},
+    common::{BitSource, CharacterSet, DecoderRXingResult, Eci, Result, StringUtils},
     DecodingHintDictionary, Exceptions,
 };
 

src/qrcode/encoder/qrcode_encoder.rs

@@ -24,7 +24,7 @@ use unicode_segmentation::UnicodeSegmentation;
 use crate::{
     common::{
         reedsolomon::{get_predefined_genericgf, PredefinedGenericGF, ReedSolomonEncoder},
-        BitArray, CharacterSet, Result, Eci,
+        BitArray, CharacterSet, Eci, Result,
     },
     qrcode::decoder::{ErrorCorrectionLevel, Mode, Version, VersionRef},
     EncodeHintType, EncodeHintValue, EncodingHintDictionary, Exceptions,
@@ -716,11 +716,7 @@ pub fn appendAlphanumericBytes(content: &str, bits: &mut BitArray) -> Result<()>
     Ok(())
 }
 
-pub fn append8BitBytes(
+pub fn append8BitBytes(content: &str, bits: &mut BitArray, encoding: CharacterSet) -> Result<()> {
-    content: &str,
-    bits: &mut BitArray,
-    encoding: CharacterSet,
-) -> Result<()> {
     let bytes = encoding
         .encode(content)
         .map_err(|e| Exceptions::writer_with(format!("error {e}")))?;