From bfcdb397ad5bda17490f2eeeff857d98bd787b99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vuka=C5=A1in=20Stepanovi=C4=87?= Date: Wed, 15 Feb 2023 11:25:01 +0000 Subject: [PATCH] remove even more needless string conversions --- src/aztec/decoder.rs | 2 +- src/datamatrix/decoder/decoded_bit_stream_parser.rs | 2 +- src/pdf417/decoder/ec/error_correction.rs | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/aztec/decoder.rs b/src/aztec/decoder.rs index f584b69..a755d52 100644 --- a/src/aztec/decoder.rs +++ b/src/aztec/decoder.rs @@ -164,7 +164,7 @@ fn get_encoded_data(corrected_bits: &[bool]) -> Result { result.push_str( &encdr .decode(&decoded_bytes, encoding::DecoderTrap::Strict) - .map_err(|a| Exceptions::illegalState(a.to_string()))?, + .map_err(|a| Exceptions::illegalState(a))?, ); decoded_bytes.clear(); diff --git a/src/datamatrix/decoder/decoded_bit_stream_parser.rs b/src/datamatrix/decoder/decoded_bit_stream_parser.rs index 946417e..ab99204 100644 --- a/src/datamatrix/decoder/decoded_bit_stream_parser.rs +++ b/src/datamatrix/decoder/decoded_bit_stream_parser.rs @@ -755,7 +755,7 @@ fn decodeBase256Segment( result.append_string( &encoding::all::ISO_8859_1 .decode(&bytes, encoding::DecoderTrap::Strict) - .map_err(|e| Exceptions::parse(e.to_string()))?, + .map_err(|e| Exceptions::parse(e))?, ); byteSegments.push(bytes); diff --git a/src/pdf417/decoder/ec/error_correction.rs b/src/pdf417/decoder/ec/error_correction.rs index 6c7dc59..15fb758 100644 --- a/src/pdf417/decoder/ec/error_correction.rs +++ b/src/pdf417/decoder/ec/error_correction.rs @@ -103,7 +103,7 @@ pub fn decode( // for (int i = 0; i < errorLocations.length; i++) { let position = received.len() as isize - 1 - field.log(errorLocations[i])? as isize; if position < 0 { - return Err(Exceptions::checksum(file!().to_string())); + return Err(Exceptions::checksum(file!())); } received[position as usize] = field.subtract(received[position as usize], errorMagnitudes[i]); @@ -140,7 +140,7 @@ fn runEuclideanAlgorithm( // Divide rLastLast by rLast, with quotient in q and remainder in r if rLast.isZero() { // Oops, Euclidean algorithm already terminated? - return Err(Exceptions::checksum(file!().to_string())); + return Err(Exceptions::checksum(file!())); } r = rLastLast; let mut q = ModulusPoly::getZero(field); //field.getZero(); @@ -162,7 +162,7 @@ fn runEuclideanAlgorithm( let sigmaTildeAtZero = t.getCoefficient(0); if sigmaTildeAtZero == 0 { - return Err(Exceptions::checksum(file!().to_string())); + return Err(Exceptions::checksum(file!())); } let inverse = field.inverse(sigmaTildeAtZero)?; @@ -190,7 +190,7 @@ fn findErrorLocations( i += 1; } if e != numErrors { - return Err(Exceptions::checksum(file!().to_string())); + return Err(Exceptions::checksum(file!())); } Ok(result) }