diff --git a/Cargo.lock b/Cargo.lock index fff75a2..fd5e17f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -228,42 +228,6 @@ dependencies = [ "syn", ] -[[package]] -name = "env_filter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] -name = "env_logger" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", -] - [[package]] name = "errno" version = "0.3.8" @@ -280,29 +244,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "is-terminal" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "itoa" version = "1.0.11" @@ -357,11 +298,9 @@ dependencies = [ "clap", "const_format", "enum_dispatch", - "env_logger 0.11.3", "libc", "log", "path-absolutize", - "pretty_env_logger", "regex", "rust-apt", "serde", @@ -395,16 +334,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -[[package]] -name = "pretty_env_logger" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" -dependencies = [ - "env_logger 0.10.2", - "log", -] - [[package]] name = "proc-macro2" version = "1.0.79" diff --git a/crates/pacdef/Cargo.toml b/crates/pacdef/Cargo.toml index 9b90c11..1d47365 100644 --- a/crates/pacdef/Cargo.toml +++ b/crates/pacdef/Cargo.toml @@ -20,9 +20,7 @@ termios = "0.3" walkdir = "2.5" libc = "0.2" enum_dispatch = "0.3" -log = "0.4" -pretty_env_logger = "0.5" -env_logger = "0.11" +log = { version = "0.4", features = ["std"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/crates/pacdef/src/main.rs b/crates/pacdef/src/main.rs index f0e7991..e716c13 100644 --- a/crates/pacdef/src/main.rs +++ b/crates/pacdef/src/main.rs @@ -31,10 +31,26 @@ Check out https://github.com/steven-omaha/pacdef/blob/main/README.md#configurati This message will not appear again. ------"; +struct PacdefLogger; + +impl log::Log for PacdefLogger { + fn enabled(&self, _: &log::Metadata) -> bool { + true + } + + fn log(&self, record: &log::Record) { + if self.enabled(record.metadata()) { + eprintln!("{} - {}", record.level(), record.args()); + } + } + + fn flush(&self) {} +} + fn main() -> ExitCode { - pretty_env_logger::formatted_builder() - .filter_level(log::LevelFilter::Info) - .init(); + log::set_boxed_logger(Box::new(PacdefLogger)) + .map(|()| log::set_max_level(log::LevelFilter::Info)) + .expect("no other loggers should have been set"); handle_final_result(main_inner()) }