Use thiserror for error handling with less boilerplate

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

View File

@@ -316,7 +316,7 @@ impl Circle<'_> {
pub fn detect(image: &BitMatrix, try_harder: bool) -> Result<MaxicodeDetectionResult> {
// find concentric circles
let Some( mut circles) = find_concentric_circles(image) else {
return Err(Exceptions::notFound);
return Err(Exceptions::NOT_FOUND);
};
// we should have an idea where the center is at this point,
@@ -339,7 +339,7 @@ pub fn detect(image: &BitMatrix, try_harder: bool) -> Result<MaxicodeDetectionRe
if try_harder {
continue;
}else {
return Err(Exceptions::notFound)
return Err(Exceptions::NOT_FOUND)
}
};
let grid_sampler = DefaultGridSampler::default();
@@ -376,7 +376,7 @@ pub fn detect(image: &BitMatrix, try_harder: bool) -> Result<MaxicodeDetectionRe
if try_harder {
continue;
}else {
return Err(Exceptions::notFound)
return Err(Exceptions::NOT_FOUND)
}
};
return Ok(MaxicodeDetectionResult {
@@ -390,7 +390,7 @@ pub fn detect(image: &BitMatrix, try_harder: bool) -> Result<MaxicodeDetectionRe
});
}
Err(Exceptions::notFound)
Err(Exceptions::NOT_FOUND)
}
/// Locate concentric circles.
@@ -729,7 +729,7 @@ fn box_symbol(image: &BitMatrix, circle: &mut Circle) -> Result<([(f32, f32); 4]
#[cfg(feature = "experimental_features")]
if is_ellipse {
// we don't deal with ellipses yet
return Err(Exceptions::notFound);
return Err(Exceptions::NOT_FOUND);
}
let mut final_rotation = 0.0;
@@ -1049,7 +1049,7 @@ fn compare_circle(a: &Circle, b: &Circle) -> std::cmp::Ordering {
pub fn read_bits(image: &BitMatrix) -> Result<BitMatrix> {
let enclosingRectangle = image
.getEnclosingRectangle()
.ok_or(Exceptions::NotFoundException(None))?;
.ok_or(Exceptions::NOT_FOUND)?;
let left = enclosingRectangle[0];
let top = enclosingRectangle[1];