From 626a5962aa19574c252239cce440b9dce1585ff0 Mon Sep 17 00:00:00 2001 From: Henry Schimke Date: Thu, 1 Dec 2022 16:23:22 -0600 Subject: [PATCH] cargo fmt --- src/multi/generic_multiple_barcode_reader.rs | 6 ++--- src/multi/mod.rs | 2 +- src/multi/multi_test_case.rs | 23 +++++++++++--------- src/multi_format_reader.rs | 1 - 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/multi/generic_multiple_barcode_reader.rs b/src/multi/generic_multiple_barcode_reader.rs index da76189..8e912cc 100644 --- a/src/multi/generic_multiple_barcode_reader.rs +++ b/src/multi/generic_multiple_barcode_reader.rs @@ -76,7 +76,7 @@ impl GenericMultipleBarcodeReader { xOffset: u32, yOffset: u32, currentDepth: u32, - ) -> Result<(),Exceptions>{ + ) -> Result<(), Exceptions> { if currentDepth > Self::MAX_DEPTH { return Ok(()); } @@ -89,8 +89,8 @@ impl GenericMultipleBarcodeReader { //} if let Err(Exceptions::ReaderException(_)) = result { return Ok(()); - }else if result.is_err(){ - return Err(result.err().unwrap()) + } else if result.is_err() { + return Err(result.err().unwrap()); } let result = result.expect("must exist"); diff --git a/src/multi/mod.rs b/src/multi/mod.rs index 1ec5bad..2fd6e66 100644 --- a/src/multi/mod.rs +++ b/src/multi/mod.rs @@ -9,4 +9,4 @@ mod generic_multiple_barcode_reader; pub use generic_multiple_barcode_reader::*; #[cfg(test)] -mod multi_test_case; \ No newline at end of file +mod multi_test_case; diff --git a/src/multi/multi_test_case.rs b/src/multi/multi_test_case.rs index 58cf2c1..738934c 100644 --- a/src/multi/multi_test_case.rs +++ b/src/multi/multi_test_case.rs @@ -16,7 +16,10 @@ use std::{path::PathBuf, rc::Rc}; -use crate::{BufferedImageLuminanceSource, BinaryBitmap, common::HybridBinarizer, MultiFormatReader, BarcodeFormat}; +use crate::{ + common::HybridBinarizer, BarcodeFormat, BinaryBitmap, BufferedImageLuminanceSource, + MultiFormatReader, +}; use super::{GenericMultipleBarcodeReader, MultipleBarcodeReader}; @@ -24,20 +27,20 @@ use super::{GenericMultipleBarcodeReader, MultipleBarcodeReader}; * Tests {@link MultipleBarcodeReader}. */ - #[test] - fn testMulti() { +#[test] +fn testMulti() { // Very basic test for now let mut testBase = PathBuf::from("test_resources/blackbox/multi-1"); testBase.push("1.png"); let image = image::io::Reader::open(testBase) - .expect("image must open") - .decode() - .expect("must decode"); - let source = BufferedImageLuminanceSource::new(image); - let bitmap = BinaryBitmap::new( Rc::new(HybridBinarizer::new(Box::new(source)))); + .expect("image must open") + .decode() + .expect("must decode"); + let source = BufferedImageLuminanceSource::new(image); + let bitmap = BinaryBitmap::new(Rc::new(HybridBinarizer::new(Box::new(source)))); - let mut reader = GenericMultipleBarcodeReader::new( MultiFormatReader::default()); + let mut reader = GenericMultipleBarcodeReader::new(MultiFormatReader::default()); let results = reader.decodeMultiple(&bitmap).expect("must decode multi"); // assertNotNull(results); assert_eq!(2, results.len()); @@ -47,4 +50,4 @@ use super::{GenericMultipleBarcodeReader, MultipleBarcodeReader}; assert_eq!("www.airtable.com/jobs", results[1].getText()); assert_eq!(&BarcodeFormat::QR_CODE, results[1].getBarcodeFormat()); - } +} diff --git a/src/multi_format_reader.rs b/src/multi_format_reader.rs index b6b8646..a7126b3 100644 --- a/src/multi_format_reader.rs +++ b/src/multi_format_reader.rs @@ -80,7 +80,6 @@ impl Reader for MultiFormatReader { } impl MultiFormatReader { - /** * Decode an image using the state set up by calling setHints() previously. Continuous scan * clients will get a large speed increase by using this instead of decode().