diff --git a/src/common/cpp_essentials/base_extentions/qrcode_version.rs b/src/common/cpp_essentials/base_extentions/qrcode_version.rs index e33f9a2..892352f 100644 --- a/src/common/cpp_essentials/base_extentions/qrcode_version.rs +++ b/src/common/cpp_essentials/base_extentions/qrcode_version.rs @@ -22,10 +22,10 @@ impl Version { //throw std::invalid_argument("Unexpected dimension"); return Err(Exceptions::ILLEGAL_ARGUMENT); } - return Self::FromNumber( + Self::FromNumber( (dimension - Self::DimensionOffset(isMicro)) / Self::DimensionStep(isMicro), isMicro, - ); + ) } pub fn FromNumber(versionNumber: u32, is_micro: bool) -> Result { diff --git a/src/datamatrix/encoder/high_level_encoder.rs b/src/datamatrix/encoder/high_level_encoder.rs index 897fd27..9c3c78c 100644 --- a/src/datamatrix/encoder/high_level_encoder.rs +++ b/src/datamatrix/encoder/high_level_encoder.rs @@ -594,7 +594,7 @@ pub fn determineConsecutiveDigitCount(msg: &str, startpos: u32) -> u32 { let len = msg.chars().count(); //len(); let mut idx = startpos; // let graphemes = msg.graphemes(true); - while (idx as usize) < len && isDigit(msg.chars().nth(idx as usize).unwrap_or(char::default())) + while (idx as usize) < len && isDigit(msg.chars().nth(idx as usize).unwrap_or_default()) { idx += 1; } diff --git a/src/oned/rss/expanded/rss_expanded_stacked_internal_test_case.rs b/src/oned/rss/expanded/rss_expanded_stacked_internal_test_case.rs index 4b83bf5..4da50ae 100644 --- a/src/oned/rss/expanded/rss_expanded_stacked_internal_test_case.rs +++ b/src/oned/rss/expanded/rss_expanded_stacked_internal_test_case.rs @@ -24,8 +24,8 @@ * http://www.piramidepse.com/ */ -use crate::common::Result; -use crate::{oned::rss::expanded::ExpandedPair, Reader}; + +use crate::{Reader}; use super::{test_case_util, RSSExpandedReader};