From 9dbdc0f91bff9897c5a340716de0712fb7e069b0 Mon Sep 17 00:00:00 2001 From: Phil Ellison Date: Sun, 5 May 2024 16:23:07 +0100 Subject: [PATCH 1/3] Remove allow(unused_imports) --- src/lib.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 6e7a45fa..82e2480b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -21,8 +21,7 @@ clippy::nonminimal_bool, clippy::expect_fun_call, clippy::many_single_char_names, - clippy::zero_prefixed_literal, - unused_imports + clippy::zero_prefixed_literals )] #[cfg(test)] From b6eae61f14f2fe0cb7e2996edad1f254f4c8809a Mon Sep 17 00:00:00 2001 From: Phil Ellison Date: Sun, 5 May 2024 16:41:01 +0100 Subject: [PATCH 2/3] Remove unused imports --- src/binary_descriptors/brief.rs | 3 --- src/contrast.rs | 2 -- src/drawing/conics.rs | 3 +-- src/drawing/line.rs | 1 - src/drawing/rect.rs | 5 ++--- src/filter/mod.rs | 12 +++++------- src/geometric_transformations.rs | 3 +-- src/gradients.rs | 1 - src/haar.rs | 2 -- src/hog.rs | 1 - src/hough.rs | 2 +- src/integral_image.rs | 4 ++-- src/lib.rs | 2 +- src/local_binary_patterns.rs | 1 - src/morphology.rs | 2 -- src/region_labelling.rs | 6 ++---- src/stats.rs | 1 - src/suppress.rs | 3 +-- src/template_matching.rs | 2 -- src/union_find.rs | 4 ---- 20 files changed, 16 insertions(+), 44 deletions(-) diff --git a/src/binary_descriptors/brief.rs b/src/binary_descriptors/brief.rs index 1ebafdaa..5db4e924 100644 --- a/src/binary_descriptors/brief.rs +++ b/src/binary_descriptors/brief.rs @@ -270,9 +270,6 @@ pub fn brief( #[cfg(test)] mod tests { use super::*; - use crate::utils::gray_bench_image; - use rand::Rng; - use test::{black_box, Bencher}; #[test] fn test_compute_hamming_distance() { diff --git a/src/contrast.rs b/src/contrast.rs index e1a137c2..ff2b717c 100644 --- a/src/contrast.rs +++ b/src/contrast.rs @@ -406,7 +406,6 @@ fn histogram_lut(source_histc: &[u32; 256], target_histc: &[u32; 256]) -> [usize mod tests { use super::*; use crate::definitions::{HasBlack, HasWhite}; - use crate::utils::gray_bench_image; use image::{GrayImage, Luma}; #[test] @@ -583,7 +582,6 @@ mod tests { #[cfg(test)] mod benches { use super::*; - use crate::definitions::{HasBlack, HasWhite}; use crate::utils::gray_bench_image; use image::{GrayImage, Luma}; use test::{black_box, Bencher}; diff --git a/src/drawing/conics.rs b/src/drawing/conics.rs index 11b07ea2..cd6d0813 100644 --- a/src/drawing/conics.rs +++ b/src/drawing/conics.rs @@ -309,7 +309,7 @@ where #[cfg(test)] mod tests { use super::draw_filled_ellipse_mut; - use image::{GenericImage, GrayImage, Luma}; + use image::GenericImage; struct Ellipse { center: (i32, i32), @@ -382,7 +382,6 @@ mod tests { #[cfg(not(miri))] #[cfg(test)] mod benches { - use super::*; use image::{GrayImage, Luma}; macro_rules! bench_hollow_ellipse { diff --git a/src/drawing/line.rs b/src/drawing/line.rs index 26bef92e..d4fdc8a2 100644 --- a/src/drawing/line.rs +++ b/src/drawing/line.rs @@ -596,7 +596,6 @@ mod tests { #[cfg(not(miri))] #[cfg(test)] mod benches { - use super::*; use image::{GrayImage, Luma}; macro_rules! bench_antialiased_lines { diff --git a/src/drawing/rect.rs b/src/drawing/rect.rs index d6f38ab7..da2914cf 100644 --- a/src/drawing/rect.rs +++ b/src/drawing/rect.rs @@ -75,7 +75,7 @@ mod tests { use super::*; use crate::drawing::Blend; use crate::rect::Rect; - use image::{GrayImage, Luma, Pixel, Rgb, RgbImage, Rgba, RgbaImage}; + use image::{GrayImage, Luma, Pixel, Rgba, RgbaImage}; #[test] fn test_draw_hollow_rect() { @@ -149,9 +149,8 @@ mod tests { #[cfg(test)] mod benches { use super::*; - use crate::drawing::Blend; use crate::rect::Rect; - use image::{GrayImage, Luma, Pixel, Rgb, RgbImage, Rgba, RgbaImage}; + use image::{Rgb, RgbImage}; use test::{black_box, Bencher}; #[bench] diff --git a/src/filter/mod.rs b/src/filter/mod.rs index e0651053..fba36cd6 100644 --- a/src/filter/mod.rs +++ b/src/filter/mod.rs @@ -570,11 +570,10 @@ pub fn laplacian_filter(image: &GrayImage) -> Image> { mod tests { use super::*; use crate::definitions::{Clamp, Image}; - use crate::utils::{gray_bench_image, rgb_bench_image}; - use image::imageops::blur; - use image::{GenericImage, GrayImage, ImageBuffer, Luma, Rgb}; + use crate::utils::{gray_bench_image}; + use image::{GrayImage, ImageBuffer, Luma}; use std::cmp::{max, min}; - use test::{black_box, Bencher}; + use test::{black_box}; #[test] fn test_bilateral_filter() { @@ -929,11 +928,10 @@ mod tests { #[cfg(test)] mod benches { use super::*; - use crate::definitions::{Clamp, Image}; + use crate::definitions::Image; use crate::utils::{gray_bench_image, rgb_bench_image}; use image::imageops::blur; - use image::{GenericImage, GrayImage, ImageBuffer, Luma, Rgb}; - use std::cmp::{max, min}; + use image::{GenericImage, ImageBuffer, Luma, Rgb}; use test::{black_box, Bencher}; #[bench] diff --git a/src/geometric_transformations.rs b/src/geometric_transformations.rs index 667290ff..49864b61 100644 --- a/src/geometric_transformations.rs +++ b/src/geometric_transformations.rs @@ -742,8 +742,7 @@ pub enum Interpolation { #[cfg(test)] mod tests { use super::*; - use crate::utils::gray_bench_image; - use image::{GrayImage, Luma}; + use image::Luma; #[test] fn test_rotate_nearest_zero_radians() { diff --git a/src/gradients.rs b/src/gradients.rs index f1e7fbb2..bb1c420c 100644 --- a/src/gradients.rs +++ b/src/gradients.rs @@ -251,7 +251,6 @@ fn gradient_magnitude(dx: f32, dy: f32) -> u16 { #[cfg(test)] mod tests { use super::*; - use crate::utils::gray_bench_image; use image::{ImageBuffer, Luma}; #[rustfmt::skip::macros(gray_image)] diff --git a/src/haar.rs b/src/haar.rs index be8efce5..db0ef98f 100644 --- a/src/haar.rs +++ b/src/haar.rs @@ -425,7 +425,6 @@ mod tests { use super::*; use crate::integral_image::{integral_image, sum_image_pixels}; use crate::utils::gray_bench_image; - use ::test; #[test] fn test_block_sizes() { @@ -741,7 +740,6 @@ mod tests { mod benches { use super::*; use crate::{integral_image::integral_image, utils::gray_bench_image}; - use test::Bencher; #[bench] fn bench_evaluate_all_features_10x10(b: &mut test::Bencher) { diff --git a/src/hog.rs b/src/hog.rs index 24cf773d..218a7142 100644 --- a/src/hog.rs +++ b/src/hog.rs @@ -497,7 +497,6 @@ fn data_length(lengths: [usize; 3]) -> usize { #[cfg(test)] mod tests { use super::*; - use crate::utils::gray_bench_image; use ::test; #[test] diff --git a/src/hough.rs b/src/hough.rs index 812b44ef..a7c048e7 100644 --- a/src/hough.rs +++ b/src/hough.rs @@ -205,7 +205,7 @@ fn intersection_points( #[cfg(test)] mod tests { use super::*; - use image::{GrayImage, ImageBuffer, Luma}; + use image::{GrayImage, Luma}; fn assert_points_eq( actual: Option<((f32, f32), (f32, f32))>, diff --git a/src/integral_image.rs b/src/integral_image.rs index e1d8c45d..17c9cd96 100644 --- a/src/integral_image.rs +++ b/src/integral_image.rs @@ -466,7 +466,7 @@ mod tests { use super::*; use crate::definitions::Image; use crate::property_testing::GrayTestImage; - use crate::utils::{gray_bench_image, pixel_diff_summary, rgb_bench_image}; + use crate::utils::pixel_diff_summary; use image::{GenericImage, ImageBuffer, Luma}; use quickcheck::{quickcheck, TestResult}; @@ -598,7 +598,7 @@ mod tests { #[cfg(test)] mod benches { use super::*; - use crate::utils::{gray_bench_image, pixel_diff_summary, rgb_bench_image}; + use crate::utils::{gray_bench_image, rgb_bench_image}; use ::test; #[bench] diff --git a/src/lib.rs b/src/lib.rs index 82e2480b..768e9858 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -21,7 +21,7 @@ clippy::nonminimal_bool, clippy::expect_fun_call, clippy::many_single_char_names, - clippy::zero_prefixed_literals + clippy::zero_prefixed_literal )] #[cfg(test)] diff --git a/src/local_binary_patterns.rs b/src/local_binary_patterns.rs index e93d6fbd..dba0951a 100644 --- a/src/local_binary_patterns.rs +++ b/src/local_binary_patterns.rs @@ -650,7 +650,6 @@ pub static MIN_SHIFT: [u8; 256] = [ #[cfg(test)] mod tests { use super::*; - use image::{GrayImage, Luma}; #[test] fn test_uniform_representative_2() { diff --git a/src/morphology.rs b/src/morphology.rs index b42522a0..b6cc0fdb 100644 --- a/src/morphology.rs +++ b/src/morphology.rs @@ -355,8 +355,6 @@ pub fn close_mut(image: &mut GrayImage, norm: Norm, k: u8) { #[cfg(test)] mod tests { use super::*; - use image::{GrayImage, Luma}; - use std::cmp::{max, min}; #[test] fn test_dilate_point_l1_0() { diff --git a/src/region_labelling.rs b/src/region_labelling.rs index 4853408b..0f581784 100644 --- a/src/region_labelling.rs +++ b/src/region_labelling.rs @@ -247,8 +247,6 @@ where mod tests { extern crate wasm_bindgen_test; - use ::test; - use image::{GrayImage, ImageBuffer, Luma}; #[cfg(target_arch = "wasm32")] use wasm_bindgen_test::*; @@ -314,9 +312,9 @@ mod benches { use super::connected_components; use super::tests::chessboard; use super::Connectivity::{Eight, Four}; - use crate::definitions::{HasBlack, HasWhite}; use ::test; - use image::{GrayImage, ImageBuffer, Luma}; + use crate::definitions::HasBlack; + use image::Luma; #[bench] fn bench_connected_components_eight_chessboard(b: &mut test::Bencher) { diff --git a/src/stats.rs b/src/stats.rs index c9293ee8..0a60fdf2 100644 --- a/src/stats.rs +++ b/src/stats.rs @@ -196,7 +196,6 @@ where #[cfg(test)] mod tests { use super::*; - use image::{GrayImage, Luma, Rgb, RgbImage}; #[test] fn test_range() { diff --git a/src/suppress.rs b/src/suppress.rs index 5397b283..aa7f6279 100644 --- a/src/suppress.rs +++ b/src/suppress.rs @@ -174,7 +174,6 @@ where mod tests { use super::{local_maxima, suppress_non_maximum}; use crate::definitions::{Position, Score}; - use crate::noise::gaussian_noise_mut; use crate::property_testing::GrayTestImage; use crate::utils::pixel_diff_summary; use image::{GenericImage, GrayImage, ImageBuffer, Luma, Primitive}; @@ -346,7 +345,7 @@ mod tests { mod benches { use super::{local_maxima, suppress_non_maximum, tests::T}; use crate::noise::gaussian_noise_mut; - use image::{GenericImage, GrayImage, ImageBuffer, Luma, Primitive}; + use image::{GrayImage, ImageBuffer, Luma}; use test::Bencher; #[bench] diff --git a/src/template_matching.rs b/src/template_matching.rs index 84db112b..282998b1 100644 --- a/src/template_matching.rs +++ b/src/template_matching.rs @@ -276,7 +276,6 @@ where #[cfg(test)] mod tests { use super::*; - use crate::utils::gray_bench_image; use image::GrayImage; #[test] @@ -440,7 +439,6 @@ mod tests { mod benches { use super::*; use crate::utils::gray_bench_image; - use image::GrayImage; use test::{black_box, Bencher}; macro_rules! bench_match_template { diff --git a/src/union_find.rs b/src/union_find.rs index 76813e0a..3b2d74e4 100644 --- a/src/union_find.rs +++ b/src/union_find.rs @@ -108,9 +108,6 @@ impl DisjointSetForest { #[cfg(test)] mod tests { use super::DisjointSetForest; - use ::test; - use rand::{rngs::StdRng, SeedableRng}; - use rand_distr::{Distribution, Uniform}; #[test] fn test_trees() { @@ -185,7 +182,6 @@ mod benches { use super::*; use rand::{rngs::StdRng, SeedableRng}; use rand_distr::{Distribution, Uniform}; - use test::Bencher; #[bench] fn bench_disjoint_set_forest(b: &mut test::Bencher) { From f28db029062da49b29bce998b963acdb05d3fa17 Mon Sep 17 00:00:00 2001 From: Phil Ellison Date: Sun, 5 May 2024 16:41:54 +0100 Subject: [PATCH 3/3] cargo fmt --- src/filter/mod.rs | 4 ++-- src/region_labelling.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/filter/mod.rs b/src/filter/mod.rs index fba36cd6..6482bfb7 100644 --- a/src/filter/mod.rs +++ b/src/filter/mod.rs @@ -570,10 +570,10 @@ pub fn laplacian_filter(image: &GrayImage) -> Image> { mod tests { use super::*; use crate::definitions::{Clamp, Image}; - use crate::utils::{gray_bench_image}; + use crate::utils::gray_bench_image; use image::{GrayImage, ImageBuffer, Luma}; use std::cmp::{max, min}; - use test::{black_box}; + use test::black_box; #[test] fn test_bilateral_filter() { diff --git a/src/region_labelling.rs b/src/region_labelling.rs index 0f581784..f5142872 100644 --- a/src/region_labelling.rs +++ b/src/region_labelling.rs @@ -312,8 +312,8 @@ mod benches { use super::connected_components; use super::tests::chessboard; use super::Connectivity::{Eight, Four}; - use ::test; use crate::definitions::HasBlack; + use ::test; use image::Luma; #[bench]