diff --git a/Cargo.lock b/Cargo.lock index d79227d..613fe0e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -288,16 +288,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" -[[package]] -name = "colored" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" -dependencies = [ - "lazy_static", - "windows-sys 0.48.0", -] - [[package]] name = "content_inspector" version = "0.2.4" @@ -392,6 +382,27 @@ version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", +] + +[[package]] +name = "env_logger" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05e7cf40684ae96ade6232ed84582f40ce0a66efcd43a5117aef610534f8e0b8" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "log", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -456,6 +467,7 @@ dependencies = [ "clap-num", "clap-verbosity-flag2", "criterion", + "env_logger", "error-stack", "expect-test", "io-adapters", @@ -467,7 +479,6 @@ dependencies = [ "rand_xoshiro", "rstest", "rustix", - "simple_logger", "supercilex-tests", "sysexits", "tempfile", @@ -1129,17 +1140,6 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" -[[package]] -name = "simple_logger" -version = "4.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e7e46c8c90251d47d08b28b8a419ffb4aede0f87c2eea95e17d1d5bacbf3ef1" -dependencies = [ - "colored", - "log", - "windows-sys 0.48.0", -] - [[package]] name = "smallvec" version = "1.13.1" diff --git a/Cargo.toml b/Cargo.toml index 90c7e2e..ec8b4f6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,6 +15,7 @@ cfg-if = "1.0.0" clap = { version = "4.4.18", features = ["derive", "wrap_help"] } clap-num = "1.1.1" clap-verbosity-flag = { package = "clap-verbosity-flag2", version = "2.1.1" } +env_logger = { version = "0.11.1", default-features = false, features = ["auto-color"] } error-stack = "0.4.1" io-adapters = "0.3.0" itoa = "1.0.10" @@ -22,7 +23,6 @@ log = { version = "0.4.20", features = ["release_max_level_info"] } rand = { version = "0.8.5", default-features = false, features = ["std"] } rand_distr = "0.4.3" rand_xoshiro = "0.6.0" -simple_logger = { version = "4.3.3", default-features = false, features = ["colors"] } sysexits = "0.7.11" thiserror = "1.0.56" thousands = "0.2.0" diff --git a/src/main.rs b/src/main.rs index 87e1541..6a7db96 100644 --- a/src/main.rs +++ b/src/main.rs @@ -216,12 +216,10 @@ fn main() -> ExitCode { let level = args.verbose.log_level().unwrap_or_else(log::Level::max); #[cfg(not(feature = "trace"))] - match simple_logger::init_with_level(level) { - Ok(()) => {} - Err(e) => { - drop(writeln!(io::stderr(), "Failed to initialize logger: {e:?}")); - } - } + env_logger::builder() + .format_timestamp(None) + .filter_level(level.to_level_filter()) + .init(); #[cfg(feature = "trace")] { use tracing_log::AsTrace; diff --git a/testdata/cmds/examples.md b/testdata/cmds/examples.md index 892898f..7308c2b 100644 --- a/testdata/cmds/examples.md +++ b/testdata/cmds/examples.md @@ -21,7 +21,7 @@ Info output: ```console $ ftzz -vv -n 1K verbose About 1,000 files will be generated in approximately 1,000 directories distributed across a tree of maximum depth 5 where each directory contains approximately 4 other directories. -INFO [ftzz::generator] Starting config: Configuration { root_dir: "verbose", files: 1000, bytes: 0, files_exact: false, bytes_exact: false, fill_byte: None, dirs_per_dir: 3.9810717055349727, bytes_per_file: 0.0, max_depth: 5, seed: 2268264718836998093, human_info: HumanInfo { dirs_per_dir: 4, total_dirs: 1000, bytes_per_files: 0 } } +[INFO ftzz::generator] Starting config: Configuration { root_dir: "verbose", files: 1000, bytes: 0, files_exact: false, bytes_exact: false, fill_byte: None, dirs_per_dir: 3.9810717055349727, bytes_per_file: 0.0, max_depth: 5, seed: 2268264718836998093, human_info: HumanInfo { dirs_per_dir: 4, total_dirs: 1000, bytes_per_files: 0 } } Created 578 files across 1,033 directories. ```