ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-27 04:42:35 +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

20
src/common/bit_matrix.rs
View File

@@ -66,7 +66,7 @@ impl BitMatrix {
*/
pub fn new(width: u32, height: u32) -> Result<Self> {
if width < 1 || height < 1 {
return Err(Exceptions::illegalArgumentWith(
return Err(Exceptions::illegal_argument_with(
"Both dimensions must be greater than 0",
));
}
@@ -138,12 +138,12 @@ impl BitMatrix {
if string_representation
.chars()
.nth(pos)
.ok_or(Exceptions::illegalState)?
.ok_or(Exceptions::ILLEGAL_STATE)?
== '\n'
|| string_representation
.chars()
.nth(pos)
.ok_or(Exceptions::illegalState)?
.ok_or(Exceptions::ILLEGAL_STATE)?
== '\r'
{
if bitsPos > rowStartPos {
@@ -152,7 +152,7 @@ impl BitMatrix {
first_run = false;
rowLength = bitsPos - rowStartPos;
} else if bitsPos - rowStartPos != rowLength {
return Err(Exceptions::illegalArgumentWith("row lengths do not match"));
return Err(Exceptions::illegal_argument_with("row lengths do not match"));
}
rowStartPos = bitsPos;
nRows += 1;
@@ -167,7 +167,7 @@ impl BitMatrix {
bits[bitsPos] = false;
bitsPos += 1;
} else {
return Err(Exceptions::illegalArgumentWith(format!(
return Err(Exceptions::illegal_argument_with(format!(
"illegal character encountered: {}",
string_representation[pos..].to_owned()
)));
@@ -181,7 +181,7 @@ impl BitMatrix {
// first_run = false;
rowLength = bitsPos - rowStartPos;
} else if bitsPos - rowStartPos != rowLength {
return Err(Exceptions::illegalArgumentWith("row lengths do not match"));
return Err(Exceptions::illegal_argument_with("row lengths do not match"));
}
nRows += 1;
}
@@ -308,7 +308,7 @@ impl BitMatrix {
pub fn xor(&mut self, mask: &BitMatrix) -> Result<()> {
if self.width != mask.width || self.height != mask.height || self.row_size != mask.row_size
{
return Err(Exceptions::illegalArgumentWith(
return Err(Exceptions::illegal_argument_with(
"input matrix dimensions do not match",
));
}
@@ -354,14 +354,14 @@ impl BitMatrix {
// ));
// }
if height < 1 || width < 1 {
return Err(Exceptions::illegalArgumentWith(
return Err(Exceptions::illegal_argument_with(
"height and width must be at least 1",
));
}
let right = left + width;
let bottom = top + height;
if bottom > self.height || right > self.width {
return Err(Exceptions::illegalArgumentWith(
return Err(Exceptions::illegal_argument_with(
"the region must fit inside the matrix",
));
}
@@ -435,7 +435,7 @@ impl BitMatrix {
self.rotate180();
Ok(())
}
_ => Err(Exceptions::illegalArgumentWith(
_ => Err(Exceptions::illegal_argument_with(
"degrees must be a multiple of 0, 90, 180, or 270",
)),
}