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

cargo clippy --fix

Browse Source
This commit is contained in:
Henry Schimke
2023-01-27 15:24:24 -06:00
parent 58e6827e89
commit 42d40de755
86 changed files with 196 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/common/abstract_black_box_test_case.rs
View File

@@ -263,7 +263,7 @@ impl<T: Reader> AbstractBlackBoxTestCase<T> {
misread_counts[x] += 1;
}
} else {
log::fine(format!("could not read at rotation {}", rotation));
log::fine(format!("could not read at rotation {rotation}"));
}
// try {
// if (decode(bitmap, rotation, expectedText, expectedMetadata, false)) {
@@ -287,7 +287,7 @@ impl<T: Reader> AbstractBlackBoxTestCase<T> {
try_harder_misread_counts[x] += 1;
}
} else {
log::fine(format!("could not read at rotation {} w/TH", rotation));
log::fine(format!("could not read at rotation {rotation} w/TH"));
}
// try {
// if (decode(bitmap, rotation, expectedText, expectedMetadata, true)) {
@@ -393,8 +393,7 @@ impl<T: Reader> AbstractBlackBoxTestCase<T> {
);
assert!(
try_harder_counts[x] >= test_rxing_result.get_try_harder_count() as usize,
"Try harder, {}",
label,
"Try harder, {label}",
);
let label = format!(
"Rotation {} degrees: Too many images misread",
@@ -408,8 +407,7 @@ impl<T: Reader> AbstractBlackBoxTestCase<T> {
assert!(
try_harder_misread_counts[x]
<= test_rxing_result.get_max_try_harder_misreads() as usize,
"Try harder, {}",
label
"Try harder, {label}"
);
}
}
@@ -468,8 +466,7 @@ impl<T: Reader> AbstractBlackBoxTestCase<T> {
let result_text = result.getText();
if expected_text != result_text {
log::info(format!(
"Content mismatch: expected '{}' but got '{}'{}",
expected_text, result_text, suffix
"Content mismatch: expected '{expected_text}' but got '{result_text}'{suffix}"
));
return Ok(false);
}
@@ -481,8 +478,7 @@ impl<T: Reader> AbstractBlackBoxTestCase<T> {
let actual_value = result_metadata.get(key);
if actual_value.is_none() || !(value == actual_value.unwrap()) {
log::info(format!(
"Metadata mismatch for key '{:?}': expected '{:?}' but got '{:?}'",
key, value, actual_value
"Metadata mismatch for key '{key:?}': expected '{value:?}' but got '{actual_value:?}'"
));
return Ok(false);
}
@@ -607,6 +603,6 @@ mod log {
}
fn prn(level: &str, data: String) {
println!("{} :: {}", level, data)
println!("{level} :: {data}")
}
}

20
tests/common/pdf_417_multiimage_span.rs
View File

@@ -149,7 +149,7 @@ impl<T: MultipleBarcodeReader + Reader> PDF417MultiImageSpanAbstractBlackBoxTest
for (name, files) in &image_files {
// for (Entry<String,List<Path>> testImageGroup : imageFiles.entrySet()) {
log::fine(format!("Starting Image Group {}", name));
log::fine(format!("Starting Image Group {name}"));
let file_base_name = name; //testImageGroup.getKey();
// let expectedText : String;
@@ -408,7 +408,7 @@ impl<T: MultipleBarcodeReader + Reader> PDF417MultiImageSpanAbstractBlackBoxTest
misread_counts[x] += 1;
}
} else {
log::fine(format!("could not read at rotation {}", rotation));
log::fine(format!("could not read at rotation {rotation}"));
}
// try {
// if (decode(bitmap, rotation, expectedText, expectedMetadata, false)) {
@@ -432,7 +432,7 @@ impl<T: MultipleBarcodeReader + Reader> PDF417MultiImageSpanAbstractBlackBoxTest
try_harder_misread_counts[x] += 1;
}
} else {
log::fine(format!("could not read at rotation {} w/TH", rotation));
log::fine(format!("could not read at rotation {rotation} w/TH"));
}
// try {
// if (decode(bitmap, rotation, expectedText, expectedMetadata, true)) {
@@ -538,8 +538,7 @@ impl<T: MultipleBarcodeReader + Reader> PDF417MultiImageSpanAbstractBlackBoxTest
);
assert!(
try_harder_counts[x] >= test_rxing_result.get_try_harder_count() as usize,
"Try harder, {}",
label,
"Try harder, {label}",
);
let label = format!(
"Rotation {} degrees: Too many images misread",
@@ -553,8 +552,7 @@ impl<T: MultipleBarcodeReader + Reader> PDF417MultiImageSpanAbstractBlackBoxTest
assert!(
try_harder_misread_counts[x]
<= test_rxing_result.get_max_try_harder_misreads() as usize,
"Try harder, {}",
label
"Try harder, {label}"
);
}
}
@@ -613,8 +611,7 @@ impl<T: MultipleBarcodeReader + Reader> PDF417MultiImageSpanAbstractBlackBoxTest
let result_text = result.getText();
if expected_text != result_text {
log::info(format!(
"Content mismatch: expected '{}' but got '{}'{}",
expected_text, result_text, suffix
"Content mismatch: expected '{expected_text}' but got '{result_text}'{suffix}"
));
return Ok(false);
}
@@ -626,8 +623,7 @@ impl<T: MultipleBarcodeReader + Reader> PDF417MultiImageSpanAbstractBlackBoxTest
let actual_value = result_metadata.get(key);
if actual_value.is_none() || !(value == actual_value.unwrap()) {
log::info(format!(
"Metadata mismatch for key '{:?}': expected '{:?}' but got '{:?}'",
key, value, actual_value
"Metadata mismatch for key '{key:?}': expected '{value:?}' but got '{actual_value:?}'"
));
return Ok(false);
}
@@ -804,6 +800,6 @@ mod log {
}
fn prn(level: &str, data: String) {
println!("{} :: {}", level, data)
println!("{level} :: {data}")
}
}