Skip to content

Commit b5692d6

Browse files
committed
chore: remove pretty_env_logger
1 parent 53e2da5 commit b5692d6

File tree

4 files changed

+13
-49
lines changed

4 files changed

+13
-49
lines changed

Cargo.lock

Lines changed: 1 addition & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ prettytable-rs = { version = "0.10", default-features = false }
1212
clap = { version = "3.1", features = ["derive"] }
1313
log = "0.4"
1414
env_logger = { version = "0.8.4", default-features = false }
15-
pretty_env_logger = "0.5"
1615
bitflags = "2.8"
1716
thiserror.workspace = true
1817
nom-supreme = "0.8"

src/cli/mod.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
use env_logger::Env;
2+
use log::LevelFilter;
3+
14
pub mod bimc;
25
pub mod font;
36
pub mod opt;
@@ -7,12 +10,11 @@ mod util;
710
/// Set up CLI
811
pub fn init<T: clap::Parser>() -> color_eyre::Result<T> {
912
color_eyre::install()?;
10-
let mut builder = pretty_env_logger::formatted_builder();
11-
builder.filter_level(log::LevelFilter::Info);
12-
if let Ok(s) = ::std::env::var("SDO_TOOL_LOG") {
13-
builder.parse_filters(&s);
14-
}
15-
builder.init();
16-
let args = T::try_parse()?;
13+
env_logger::Builder::new()
14+
.filter_level(LevelFilter::Info)
15+
.format_timestamp(None)
16+
.parse_env(Env::new().filter("SDO_TOOL_LOG"))
17+
.init();
18+
let args = T::parse();
1719
Ok(args)
1820
}

src/main.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
//! # Signum! file tool
22
#![warn(missing_docs)]
33

4-
use clap::Parser;
54
use color_eyre::eyre::{self, eyre, WrapErr};
6-
use env_logger::Env;
7-
use log::{error, info, LevelFilter};
5+
use log::{error, info};
86
use sdo_tool::cli::{
97
bimc::process_bimc,
108
font::{process_cset_v2, process_eset, process_ls30, process_ps09, process_ps24},
9+
init,
1110
opt::Options,
1211
sdoc::{process_sdoc, process_sdoc_v3},
1312
};
@@ -21,13 +20,7 @@ use std::{
2120
};
2221

2322
fn main() -> eyre::Result<()> {
24-
color_eyre::install()?;
25-
env_logger::Builder::new()
26-
.filter_level(LevelFilter::Info)
27-
.format_timestamp(None)
28-
.parse_env(Env::new().filter("SDO_TOOL_LOG"))
29-
.init();
30-
let opt = Options::parse();
23+
let opt = init::<Options>()?;
3124
let file_res = File::open(&opt.file);
3225
let file = WrapErr::wrap_err_with(file_res, || {
3326
format!("Failed to open file: `{}`", opt.file.display())

0 commit comments

Comments
 (0)