ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-26 04:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use thiserror for error handling with less boilerplate

Browse Source
This commit is contained in:
Steve Cook
2023-02-20 09:41:28 -05:00
parent 01e4f4a126
commit f8b29f37db
135 changed files with 868 additions and 905 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/qrcode/decoder/decoded_bit_stream_parser.rs
View File

@@ -78,7 +78,7 @@ pub fn decode(
}
Mode::STRUCTURED_APPEND => {
if bits.available() < 16 {
return Err(Exceptions::formatWith(format!(
return Err(Exceptions::format_with(format!(
"Mode::Structured append expected bits.available() < 16, found bits of {}",
bits.available()
)));
@@ -93,7 +93,7 @@ pub fn decode(
let value = parseECIValue(&mut bits)?;
currentCharacterSetECI = CharacterSetECI::getCharacterSetECIByValue(value).ok();
if currentCharacterSetECI.is_none() {
return Err(Exceptions::formatWith(format!(
return Err(Exceptions::format_with(format!(
"Value of {value} not valid"
)));
}
@@ -132,7 +132,7 @@ pub fn decode(
currentCharacterSetECI,
hints,
)?,
_ => return Err(Exceptions::format),
_ => return Err(Exceptions::FORMAT),
}
}
}
@@ -177,7 +177,7 @@ pub fn decode(
fn decodeHanziSegment(bits: &mut BitSource, result: &mut String, count: usize) -> Result<()> {
// Don't crash trying to read more bits than we have available.
if count * 13 > bits.available() {
return Err(Exceptions::format);
return Err(Exceptions::FORMAT);
}
// Each character will require 2 bytes. Read the characters as 2-byte pairs
@@ -204,10 +204,10 @@ fn decodeHanziSegment(bits: &mut BitSource, result: &mut String, count: usize) -
}
let gb_encoder =
encoding::label::encoding_from_whatwg_label("GBK").ok_or(Exceptions::illegalState)?;
encoding::label::encoding_from_whatwg_label("GBK").ok_or(Exceptions::ILLEGAL_STATE)?;
let encode_string = gb_encoder
.decode(&buffer, encoding::DecoderTrap::Strict)
.map_err(|e| Exceptions::parseWith(format!("unable to decode buffer {buffer:?}: {e}")))?;
.map_err(|e| Exceptions::parse_with(format!("unable to decode buffer {buffer:?}: {e}")))?;
result.push_str(&encode_string);
Ok(())
}
@@ -221,7 +221,7 @@ fn decodeKanjiSegment(
) -> Result<()> {
// Don't crash trying to read more bits than we have available.
if count * 13 > bits.available() {
return Err(Exceptions::format);
return Err(Exceptions::FORMAT);
}
// Each character will require 2 bytes. Read the characters as 2-byte pairs
@@ -250,7 +250,7 @@ fn decodeKanjiSegment(
let encoder = {
let _ = currentCharacterSetECI;
let _ = hints;
encoding::label::encoding_from_whatwg_label("SJIS").ok_or(Exceptions::format)?
encoding::label::encoding_from_whatwg_label("SJIS").ok_or(Exceptions::FORMAT)?
};
#[cfg(feature = "allow_forced_iso_ied_18004_compliance")]
@@ -263,12 +263,12 @@ fn decodeKanjiSegment(
encoding::all::ISO_8859_1
}
} else {
encoding::label::encoding_from_whatwg_label("SJIS").ok_or(Exceptions::format)?
encoding::label::encoding_from_whatwg_label("SJIS").ok_or(Exceptions::FORMAT)?
};
let encode_string = encoder
.decode(&buffer, encoding::DecoderTrap::Strict)
.map_err(|e| Exceptions::parseWith(format!("unable to decode buffer {buffer:?}: {e}")))?;
.map_err(|e| Exceptions::parse_with(format!("unable to decode buffer {buffer:?}: {e}")))?;
result.push_str(&encode_string);
@@ -285,7 +285,7 @@ fn decodeByteSegment(
) -> Result<()> {
// Don't crash trying to read more bits than we have available.
if 8 * count > bits.available() {
return Err(Exceptions::format);
return Err(Exceptions::FORMAT);
}
let mut readBytes = vec![0u8; count];
@@ -301,7 +301,7 @@ fn decodeByteSegment(
// give a hint.
{
#[cfg(not(feature = "allow_forced_iso_ied_18004_compliance"))]
StringUtils::guessCharset(&readBytes, hints).ok_or(Exceptions::illegalState)?
StringUtils::guessCharset(&readBytes, hints).ok_or(Exceptions::ILLEGAL_STATE)?
}
#[cfg(feature = "allow_forced_iso_ied_18004_compliance")]
@@ -316,14 +316,14 @@ fn decodeByteSegment(
CharacterSetECI::getCharset(
currentCharacterSetECI
.as_ref()
.ok_or(Exceptions::illegalState)?,
.ok_or(Exceptions::ILLEGAL_STATE)?,
)
};
let encode_string = if currentCharacterSetECI.is_some()
&& currentCharacterSetECI
.as_ref()
.ok_or(Exceptions::illegalState)?
.ok_or(Exceptions::ILLEGAL_STATE)?
== &CharacterSetECI::Cp437
{
{
@@ -336,7 +336,7 @@ fn decodeByteSegment(
encoding
.decode(&readBytes, encoding::DecoderTrap::Strict)
.map_err(|e| {
Exceptions::parseWith(format!("unable to decode buffer {readBytes:?}: {e}"))
Exceptions::parse_with(format!("unable to decode buffer {readBytes:?}: {e}"))
})?
};
@@ -348,13 +348,13 @@ fn decodeByteSegment(
fn toAlphaNumericChar(value: u32) -> Result<char> {
if value as usize >= ALPHANUMERIC_CHARS.len() {
return Err(Exceptions::format);
return Err(Exceptions::FORMAT);
}
ALPHANUMERIC_CHARS
.chars()
.nth(value as usize)
.ok_or(Exceptions::format)
.ok_or(Exceptions::FORMAT)
}
fn decodeAlphanumericSegment(
@@ -368,7 +368,7 @@ fn decodeAlphanumericSegment(
let mut count = count;
while count > 1 {
if bits.available() < 11 {
return Err(Exceptions::format);
return Err(Exceptions::FORMAT);
}
let nextTwoCharsBits = bits.readBits(11)?;
result.push(toAlphaNumericChar(nextTwoCharsBits / 45)?);
@@ -378,7 +378,7 @@ fn decodeAlphanumericSegment(
if count == 1 {
// special case: one character left
if bits.available() < 6 {
return Err(Exceptions::format);
return Err(Exceptions::FORMAT);
}
result.push(toAlphaNumericChar(bits.readBits(6)?)?);
}
@@ -386,12 +386,12 @@ fn decodeAlphanumericSegment(
if fc1InEffect {
// We need to massage the result a bit if in an FNC1 mode:
for i in start..result.len() {
if result.chars().nth(i).ok_or(Exceptions::indexOutOfBounds)? == '%' {
if result.chars().nth(i).ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)? == '%' {
if i < result.len() - 1
&& result
.chars()
.nth(i + 1)
.ok_or(Exceptions::indexOutOfBounds)?
.ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?
== '%'
{
// %% is rendered as %
@@ -413,11 +413,11 @@ fn decodeNumericSegment(bits: &mut BitSource, result: &mut String, count: usize)
while count >= 3 {
// Each 10 bits encodes three digits
if bits.available() < 10 {
return Err(Exceptions::format);
return Err(Exceptions::FORMAT);
}
let threeDigitsBits = bits.readBits(10)?;
if threeDigitsBits >= 1000 {
return Err(Exceptions::format);
return Err(Exceptions::FORMAT);
}
result.push(toAlphaNumericChar(threeDigitsBits / 100)?);
result.push(toAlphaNumericChar((threeDigitsBits / 10) % 10)?);
@@ -427,22 +427,22 @@ fn decodeNumericSegment(bits: &mut BitSource, result: &mut String, count: usize)
if count == 2 {
// Two digits left over to read, encoded in 7 bits
if bits.available() < 7 {
return Err(Exceptions::format);
return Err(Exceptions::FORMAT);
}
let twoDigitsBits = bits.readBits(7)?;
if twoDigitsBits >= 100 {
return Err(Exceptions::format);
return Err(Exceptions::FORMAT);
}
result.push(toAlphaNumericChar(twoDigitsBits / 10)?);
result.push(toAlphaNumericChar(twoDigitsBits % 10)?);
} else if count == 1 {
// One digit left over to read
if bits.available() < 4 {
return Err(Exceptions::format);
return Err(Exceptions::FORMAT);
}
let digitBits = bits.readBits(4)?;
if digitBits >= 10 {
return Err(Exceptions::format);
return Err(Exceptions::FORMAT);
}
result.push(toAlphaNumericChar(digitBits)?);
}
@@ -467,5 +467,5 @@ fn parseECIValue(bits: &mut BitSource) -> Result<u32> {
return Ok(((firstByte & 0x1F) << 16) | secondThirdBytes);
}
Err(Exceptions::format)
Err(Exceptions::FORMAT)
}