chore: fixes

Author: dnbln

dir-structure-tools/Cargo.toml

@@ -91,6 +91,7 @@ _all = [
 
 [dev-dependencies]
 dir-structure = { workspace = true, features = ["derive"] }
+tokio = { version = "1", features = ["full"] }
 
 [dependencies]
 dir-structure = { workspace = true, default-features = false }
@@ -126,107 +127,82 @@ git2 = { workspace = true, optional = true }
 [[test]]
 name = "async_tests"
 path = "tests/async_tests.rs"
-required-features = ["async", "tokio", "assert_eq", "derive", "tools"]
+required-features = ["async", "tokio", "assert_eq", "tools"]
 
 [[test]]
 name = "tests"
 path = "tests/tests.rs"
-required-features = ["assert_eq", "derive", "tools"]
+required-features = ["assert_eq", "tools"]
 
 [[example]]
 name = "reading_from_include_dir_vfs"
 path = "examples/reading_from_include_dir_vfs.rs"
-required-features = ["include_dir", "derive"]
+required-features = ["include_dir"]
 
 [[example]]
 name = "reading_dir_children_from_include_dir_vfs"
 path = "examples/reading_dir_children_from_include_dir_vfs.rs"
-required-features = ["include_dir", "derive", "tools-dir-children"]
+required-features = ["include_dir", "tools-dir-children"]
 
 [[example]]
 name = "reading_from_git_vfs"
 path = "examples/reading_from_git_vfs.rs"
-required-features = ["git", "derive"]
-
-[[example]]
-name = "reading_from_tokio_fs_vfs"
-path = "examples/reading_from_tokio_fs_vfs.rs"
-required-features = ["tokio", "async", "derive"]
-
-[[example]]
-name = "writing_to_tokio_fs_vfs"
-path = "examples/writing_to_tokio_fs_vfs.rs"
-required-features = ["tokio", "async", "derive"]
-
-[[example]]
-name = "std_fs_vfs"
-path = "examples/std_fs_vfs.rs"
-required-features = ["derive"]
+required-features = ["git"]
 
 [[example]]
 name = "deferred_read"
 path = "examples/deferred_read.rs"
-required-features = ["derive", "tools-deferred-read"]
+required-features = ["deferred-read"]
 
 [[example]]
 name = "deferred_read_or_own"
 path = "examples/deferred_read_or_own.rs"
-required-features = ["derive", "tools-deferred-read-or-own"]
-
-[[example]]
-name = "reading"
-path = "examples/reading.rs"
-required-features = ["derive"]
-
-[[example]]
-name = "writing"
-path = "examples/writing.rs"
-required-features = ["derive"]
+required-features = ["deferred-read-or-own"]
 
 [[example]]
 name = "reading_dir_children"
 path = "examples/reading_dir_children.rs"
-required-features = ["derive", "tools-dir-children"]
+required-features = ["dir-children"]
 
 [[example]]
 name = "writing_dir_children"
 path = "examples/writing_dir_children.rs"
-required-features = ["derive", "tools-dir-children"]
+required-features = ["dir-children"]
 
 [[example]]
 name = "clean_dir"
 path = "examples/clean_dir.rs"
-required-features = ["derive", "tools-clean-dir"]
+required-features = ["clean-dir"]
 
 [[example]]
 name = "json"
 path = "examples/json.rs"
-required-features = ["derive", "json"]
+required-features = ["json"]
 
 [[example]]
 name = "json_pretty"
 path = "examples/json_pretty.rs"
-required-features = ["derive", "json"]
+required-features = ["json"]
 
 [[example]]
 name = "toml"
 path = "examples/toml.rs"
-required-features = ["derive", "toml"]
+required-features = ["toml"]
 
 [[example]]
 name = "yaml"
 path = "examples/yaml.rs"
-required-features = ["derive", "yaml"]
+required-features = ["yaml"]
 
 [[example]]
 name = "ron"
 path = "examples/ron.rs"
-required-features = ["derive", "ron"]
+required-features = ["ron"]
 
 [[example]]
 name = "ron_pretty"
 path = "examples/ron_pretty.rs"
-required-features = ["derive", "ron"]
+required-features = ["ron"]
 
 [lints]
 workspace = true

dir-structure-tools/examples/clean_dir.rs

@@ -5,8 +5,8 @@
 use std::error::Error;
 use std::fs;
 
-use dir_structure_tools::clean_dir::CleanDir;
 use dir_structure::prelude::*;
+use dir_structure_tools::clean_dir::CleanDir;
 
 mod example_dirs;
 

dir-structure-tools/examples/deferred_read.rs

@@ -5,8 +5,8 @@
 use std::error::Error;
 use std::fs;
 
-use dir_structure_tools::deferred_read::DeferredRead;
 use dir_structure::prelude::*;
+use dir_structure_tools::deferred_read::DeferredRead;
 
 mod example_dirs;
 

dir-structure-tools/examples/deferred_read_or_own.rs

@@ -5,9 +5,9 @@
 
 use std::error::Error;
 
-use dir_structure_tools::deferred_read_or_own::DeferredReadOrOwn;
 use dir_structure::prelude::*;
 use dir_structure::traits::vfs::VfsCore;
+use dir_structure_tools::deferred_read_or_own::DeferredReadOrOwn;
 
 mod example_dirs;
 

dir-structure-tools/examples/reading_dir_children.rs

@@ -1,8 +1,8 @@
 //! An example demonstrating the use of [`DirChildren`] to read dynamic directory contents.
 
+use dir_structure::prelude::*;
 use dir_structure_tools::NoFilter;
 use dir_structure_tools::dir_children::DirChildren;
-use dir_structure::prelude::*;
 
 mod example_dirs;
 

dir-structure-tools/examples/reading_dir_children_from_include_dir_vfs.rs

@@ -6,9 +6,9 @@
 use std::path::Path;
 use std::pin::Pin;
 
+use dir_structure::prelude::*;
 use dir_structure_tools::NoFilter;
 use dir_structure_tools::dir_children::DirChildren;
-use dir_structure::prelude::*;
 
 #[derive(dir_structure::DirStructure)]
 pub struct Dir<Vfs: VfsCore> {

dir-structure-tools/examples/writing_dir_children.rs

@@ -1,10 +1,10 @@
 use std::fs;
 
+use dir_structure::prelude::*;
+use dir_structure::traits::vfs::VfsCore;
 use dir_structure_tools::NoFilter;
 use dir_structure_tools::dir_children::DirChild;
 use dir_structure_tools::dir_children::DirChildren;
-use dir_structure::prelude::*;
-use dir_structure::traits::vfs::VfsCore;
 
 mod example_dirs;
 

dir-structure-tools/src/image.rs

@@ -1,10 +1,10 @@
 //! Implementations of [`ReadFrom`] and [`WriteTo`] for image files.
-//! 
+//!
 //! The [`image`] crate is used for image decoding and encoding.
-//! 
+//!
 //! Main wrapper type is the [`Img`] struct, which is generic over an image format.
 //! Specific image formats are provided as zero-sized types implementing the [`ImgFormat`] trait.
-//! 
+//!
 //! The following image formats are supported, behind feature flags:
 //!
 //! - PNG (`image-format-png`)
@@ -21,10 +21,10 @@
 //! - Farbfeld (`image-format-ff`)
 //! - AVIF (`image-format-avif`)
 //! - QOI (`image-format-qoi`)
-//! 
+//!
 //! For an async VFS implementation to support reading and writing images using these types,
 //! the following impls are required for the VFS type:
-//! 
+//!
 //! - `impl<T: ImgFormat> ReadImageFromAsync<T> for NewVfsType`
 //! - `impl<'a> WriteImageToAsync<'a> for NewVfsType`
 //! - `impl<'a> WriteImageToAsyncRef<'a> for NewVfsType`

dir-structure-tools/tests/async_tests.rs

@@ -4,15 +4,15 @@ use std::pin::Pin;
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;
 
-use dir_structure::clean_dir::CleanDir;
-use dir_structure_tools::dir_children::DirChild;
-use dir_structure_tools::dir_children::DirChildren;
 use dir_structure::prelude::*;
 use dir_structure::traits::async_vfs::VfsAsync;
 use dir_structure::traits::async_vfs::WriteSupportingVfsAsync;
+use dir_structure::vfs::tokio_fs_vfs::TokioFsVfs;
+use dir_structure_tools::clean_dir::CleanDir;
+use dir_structure_tools::dir_children::DirChild;
+use dir_structure_tools::dir_children::DirChildren;
 use dir_structure_tools::versioned::Versioned;
 use dir_structure_tools::versioned::VersionedString;
-use dir_structure::vfs::tokio_fs_vfs::TokioFsVfs;
 
 fn test_dir(name: &str) -> PathBuf {
     let p = Path::new(env!("CARGO_TARGET_TMPDIR"))

dir-structure-tools/tests/tests.rs

@@ -6,15 +6,15 @@ use std::pin::Pin;
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;
 
-use dir_structure::NoFilter;
-use dir_structure::clean_dir::CleanDir;
-use dir_structure_tools::dir_children::DirChild;
-use dir_structure_tools::dir_children::DirChildren;
 use dir_structure::prelude::*;
 use dir_structure::traits::vfs;
+use dir_structure::vfs::fs_vfs::FsVfs;
+use dir_structure_tools::NoFilter;
+use dir_structure_tools::clean_dir::CleanDir;
+use dir_structure_tools::dir_children::DirChild;
+use dir_structure_tools::dir_children::DirChildren;
 use dir_structure_tools::versioned::Versioned;
 use dir_structure_tools::versioned::VersionedString;
-use dir_structure::vfs::fs_vfs::FsVfs;
 
 fn test_dir(name: &str) -> PathBuf {
     let p = Path::new(env!("CARGO_TARGET_TMPDIR"))