chore: merge branch feat/conv into feat/packfiledir

Author: UserIsntAvailable

ashen/Cargo.toml

@@ -17,7 +17,7 @@ paste = "1.0.14"
 version = "0.24.8"
 optional = true
 default-features = false
-features = ["png"]
+features = ["png", "gif"]
 
 [dev-dependencies]
 assert_approx_eq = "1.1.0"

ashen/src/asset/model/mod.rs

@@ -8,8 +8,9 @@ use dat::{
 };
 
 use super::{
+    Parser,
+    color_map::Color,
     texture::{Texture, TextureSize},
-    Color, Parser,
 };
 use crate::utils::{format::ModelPythonFile, nom::*};
 
@@ -85,7 +86,7 @@ mod tests {
 
     use super::Model;
     use crate::{
-        asset::{color_map::ColorMap, Parser},
+        asset::{Parser, color_map::ColorMap},
         utils::{format::ModelPythonFile, test::*},
     };
 

ashen/src/utils/format.rs

@@ -1,5 +1,7 @@
+#[cfg(any(test, feature = "conv"))]
 use std::ops::Deref;
 
+#[cfg(any(test, feature = "conv"))]
 use image::{
     Frame, ImageEncoder, RgbaImage,
     codecs::{
@@ -15,11 +17,13 @@ use crate::asset::{
     sound::sample::{AudioBuffer, AudioSamplePoint},
 };
 
+#[cfg(any(test, feature = "conv"))]
 pub trait PngFile {
     fn to_png(&self) -> Vec<u8>;
 }
 
 // impl for any 2D array like data structure.
+#[cfg(any(test, feature = "conv"))]
 impl<Outer: ?Sized, Inner> PngFile for Outer
 where
     Outer: Deref<Target = [Inner]>,
@@ -53,10 +57,12 @@ where
     }
 }
 
+#[cfg(any(test, feature = "conv"))]
 pub trait GifFile {
     fn to_gif(&self) -> Vec<u8>;
 }
 
+#[cfg(any(test, feature = "conv"))]
 impl<Outer: ?Sized, Inner1, Inner2> GifFile for Outer
 where
     Outer: Deref<Target = [Inner1]>,

ashen/src/utils/mod.rs

@@ -1,5 +1,5 @@
 pub mod compression;
-#[cfg(any(test, feature = "conv"))]
+// TODO(Unavailable): Rename to "conv"
 pub mod format;
 pub mod iterator;
 pub mod nom;