Merge branch 'main' into thiserror

# Conflicts:
#	src/aztec/decoder.rs
#	src/datamatrix/decoder/decoded_bit_stream_parser.rs

src/qrcode/decoder/FormatInformationTestCase.rs

@@ -28,7 +28,7 @@ fn testBitsDiffering() {
     assert_eq!(0, FormatInformation::numBitsDiffering(1, 1));
     assert_eq!(1, FormatInformation::numBitsDiffering(0, 2));
     assert_eq!(2, FormatInformation::numBitsDiffering(1, 2));
-    assert_eq!(32, FormatInformation::numBitsDiffering(-1i32 as u32, 0));
+    assert_eq!(32, FormatInformation::numBitsDiffering(u32::MAX, 0));
 }
 
 #[test]

src/qrcode/decoder/decoded_bit_stream_parser.rs

@@ -48,8 +48,8 @@ pub fn decode(
     let mut bits = BitSource::new(bytes.to_owned());
     let mut result = String::with_capacity(50);
     let mut byteSegments = vec![vec![0u8; 0]; 0];
-    let mut symbolSequence = -1i32;
-    let mut parityData = -1i32;
+    let mut symbolSequence = -1;
+    let mut parityData = -1;
 
     let mut currentCharacterSetECI = None;
     let mut fc1InEffect = false;

src/qrcode/encoder/bit_vector_testcase.rs

@@ -22,7 +22,7 @@ use crate::common::BitArray;
  */
 
 fn getUnsignedInt(v: &BitArray) -> u64 {
-    let mut result = 0u64;
+    let mut result: u64 = 0;
     const OFFSET: usize = 0;
     for i in 0..32 {
         // for (int i = 0, offset = 0; i < 32; i++) {