From 967047eb66374e1e5928d50970b663a0d80f8652 Mon Sep 17 00:00:00 2001 From: Henry Schimke Date: Mon, 28 Nov 2022 11:51:46 -0600 Subject: [PATCH] cargo fmt --- src/datamatrix/decoder/data_block.rs | 2 +- src/datamatrix/detector/detector.rs | 4 ++-- src/multi_format_reader.rs | 2 +- src/multi_format_writer.rs | 8 +++++--- tests/common/abstract_black_box_test_case.rs | 3 ++- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/datamatrix/decoder/data_block.rs b/src/datamatrix/decoder/data_block.rs index 396b696..1bc57d7 100644 --- a/src/datamatrix/decoder/data_block.rs +++ b/src/datamatrix/decoder/data_block.rs @@ -75,7 +75,7 @@ impl DataBlock { numDataCodewords as u32, vec![0; numBlockCodewords], )); - numRXingResultBlocks +=1; + numRXingResultBlocks += 1; } } diff --git a/src/datamatrix/detector/detector.rs b/src/datamatrix/detector/detector.rs index c1e0be0..e54410e 100644 --- a/src/datamatrix/detector/detector.rs +++ b/src/datamatrix/detector/detector.rs @@ -170,7 +170,7 @@ impl Detector { /** * Detect a second solid side next to first solid side. */ - fn detectSolid2(&self, points: [RXingResultPoint;4]) -> [RXingResultPoint; 4] { + fn detectSolid2(&self, points: [RXingResultPoint; 4]) -> [RXingResultPoint; 4] { // A..D // : : // B--C @@ -262,7 +262,7 @@ impl Detector { /** * Shift the edge points to the module center. */ - fn shiftToModuleCenter(&self, points: [RXingResultPoint;4]) -> [RXingResultPoint; 4] { + fn shiftToModuleCenter(&self, points: [RXingResultPoint; 4]) -> [RXingResultPoint; 4] { // A..D // | : // B--C diff --git a/src/multi_format_reader.rs b/src/multi_format_reader.rs index 9f89633..49cda3e 100644 --- a/src/multi_format_reader.rs +++ b/src/multi_format_reader.rs @@ -169,7 +169,7 @@ impl MultiFormatReader { //TODO: ADD MultiformatOneDReader here } } - self.readers = readers;//Vec::new(); //readers.toArray(EMPTY_READER_ARRAY); + self.readers = readers; //Vec::new(); //readers.toArray(EMPTY_READER_ARRAY); } pub fn decodeInternal(&mut self, image: &BinaryBitmap) -> Result { diff --git a/src/multi_format_writer.rs b/src/multi_format_writer.rs index 5c0ad91..e0b7603 100644 --- a/src/multi_format_writer.rs +++ b/src/multi_format_writer.rs @@ -16,7 +16,10 @@ use std::collections::HashMap; -use crate::{aztec::AztecWriter, qrcode::QRCodeWriter, BarcodeFormat, Exceptions, Writer, datamatrix::DataMatrixWriter}; +use crate::{ + aztec::AztecWriter, datamatrix::DataMatrixWriter, qrcode::QRCodeWriter, BarcodeFormat, + Exceptions, Writer, +}; /** * This is a factory class which finds the appropriate Writer subclass for the BarcodeFormat @@ -67,8 +70,7 @@ impl Writer for MultiFormatWriter { // writer = PDF417Writer(), BarcodeFormat::CODABAR => unimplemented!(""), // writer = CodaBarWriter(), - BarcodeFormat::DATA_MATRIX => - Box::new(DataMatrixWriter{}), + BarcodeFormat::DATA_MATRIX => Box::new(DataMatrixWriter {}), BarcodeFormat::AZTEC => Box::new(AztecWriter {}), _ => { return Err(Exceptions::IllegalArgumentException(format!( diff --git a/tests/common/abstract_black_box_test_case.rs b/tests/common/abstract_black_box_test_case.rs index 64d84e6..f335480 100644 --- a/tests/common/abstract_black_box_test_case.rs +++ b/tests/common/abstract_black_box_test_case.rs @@ -17,7 +17,8 @@ use std::{ collections::HashMap, fs::{read_dir, read_to_string}, - path::{Path, PathBuf}, rc::Rc, + path::{Path, PathBuf}, + rc::Rc, }; use rxing::{