From 57afe90cfcd5fb5a22e4d548d67239a894ef74df Mon Sep 17 00:00:00 2001
From: Louis Capitanchik <contact@louiscap.co>
Date: Sun, 6 Aug 2023 22:04:52 +0100
Subject: [PATCH] Lint & Fmt
---
src/commands/atlas.rs | 28 +++++++---------------------
src/commands/extrude.rs | 6 +++---
src/commands/reduce.rs | 7 ++-----
src/commands/split.rs | 11 +----------
4 files changed, 13 insertions(+), 39 deletions(-)
diff --git a/src/commands/atlas.rs b/src/commands/atlas.rs
index d867dbc..b401801 100644
--- a/src/commands/atlas.rs
+++ b/src/commands/atlas.rs
@@ -1,27 +1,13 @@
+use crate::format::load_image;
use clap::Parser;
+use etagere::{AllocId, AtlasAllocator, Rectangle, Size};
+use image::{image_dimensions, GenericImage, Rgba, RgbaImage};
+use rayon::prelude::{IntoParallelIterator, ParallelIterator};
+use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::fmt::Display;
use std::fs::File;
-
-use image::{
- image_dimensions, GenericImage, GenericImageView, ImageFormat, Pixel, Rgba, RgbaImage,
-};
-
-use num_traits::AsPrimitive;
-
-use serde::{Deserialize, Serialize};
-
-use crate::format::load_image;
-use etagere::{AllocId, AtlasAllocator, Rectangle, Size};
-use glob::MatchOptions;
-use rayon::prelude::{IntoParallelIterator, ParallelBridge, ParallelIterator};
-use std::path::{Path, PathBuf};
-use thiserror::__private::DisplayAsDisplay;
-
-#[inline(always)]
-fn tile_size() -> u32 {
- 32
-}
+use std::path::PathBuf;
fn default_max_size() -> usize {
2048
@@ -131,7 +117,7 @@ impl Atlas {
.map(|rect| (ident.page, slice.path, rect))
})
.fold(HashMap::default(), |mut map, (page, path, rect)| {
- let mut entry = map.entry(page).or_default();
+ let entry = map.entry(page).or_default();
entry.push((path, rect));
map
});
diff --git a/src/commands/extrude.rs b/src/commands/extrude.rs
index 1bbff08..3c0e946 100644
--- a/src/commands/extrude.rs
+++ b/src/commands/extrude.rs
@@ -1,9 +1,9 @@
use crate::utils::{RgbaOutputFormat, SpriteData};
use clap::Parser;
-use image::flat::View;
+
use image::math::Rect;
-use image::{DynamicImage, GenericImage, GenericImageView, Pixel, Rgba, RgbaImage};
-use num_traits::cast::ToPrimitive;
+use image::{GenericImage, GenericImageView, Rgba, RgbaImage};
+
use serde::{Deserialize, Serialize};
use std::ops::Deref;
diff --git a/src/commands/reduce.rs b/src/commands/reduce.rs
index 490ca5c..1b4ef55 100644
--- a/src/commands/reduce.rs
+++ b/src/commands/reduce.rs
@@ -1,12 +1,9 @@
-
-
-use crate::utils::{RgbaOutputFormat};
+use crate::utils::RgbaOutputFormat;
use anyhow::Error;
use clap::Parser;
-use image::{GenericImage};
+use image::GenericImage;
use serde::{Deserialize, Serialize};
-
/// Limit the number of colours by quantity or threshold
#[derive(Debug, Clone, Parser, Serialize, Deserialize)]
#[clap(author, version = "0.3.0")]
diff --git a/src/commands/split.rs b/src/commands/split.rs
index 06d783d..d07ea8a 100644
--- a/src/commands/split.rs
+++ b/src/commands/split.rs
@@ -1,16 +1,7 @@
-
-
use clap::Parser;
-
-use image::{
- GenericImageView, ImageFormat,
- Pixel, RgbaImage,
-};
-
+use image::{GenericImageView, ImageFormat, Pixel, RgbaImage};
use num_traits::AsPrimitive;
-
use serde::{Deserialize, Serialize};
-
use std::path::PathBuf;
#[inline(always)]
--
GitLab