Skip to content

Commit d161a15

Browse files
authored
replace anyhow with thiserror, migrate logging to tracing, switch tests to tree-fs (#149)
1 parent 0ec9f67 commit d161a15

31 files changed

+486
-308
lines changed

Cargo.lock

Lines changed: 131 additions & 67 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

shellfirm/Cargo.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ clap = { version = "4.5", features = ["cargo"], optional = true }
1717
clap_complete = { version = "4.5", optional = true }
1818
clap_complete_nushell = { version = "4.5", optional = true }
1919
dirs = "6.0"
20-
anyhow = "1.0"
20+
thiserror = "2"
2121
serde = "1.0"
2222
serde_yaml = "0.9"
2323
serde_derive = "1.0"
2424
serde_regex = "1.1"
2525
regex = "1.12"
2626
rayon = "1.11"
2727
rand = "0.10"
28-
log = "0.4"
29-
env_logger = "0.11"
28+
tracing = "0.1"
29+
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
3030
console = "0.16"
3131
exitcode = "1.1"
3232
requestty = "0.6"
@@ -48,10 +48,9 @@ windows-sys = { version = "0.59", features = ["Win32_System_Console", "Win32_Fou
4848

4949
[dev-dependencies]
5050
insta = { version = "1.46", features = ["filters"] }
51-
tempfile = "3"
51+
tree-fs = "0.2"
5252

5353
[build-dependencies]
54-
anyhow = "1.0"
5554

5655
[features]
5756
default = ["all"]

shellfirm/build.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
use std::{env, fs, fs::File, io::prelude::*, path::Path};
22

3-
use anyhow::Result;
4-
5-
fn main() -> Result<()> {
3+
fn main() -> Result<(), Box<dyn std::error::Error>> {
64
println!("cargo:rerun-if-changed=checks/");
75

86
let out_dir = env::var("OUT_DIR")?;

shellfirm/src/agent.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
1010
use std::sync::OnceLock;
1111

12-
use anyhow::Result;
12+
use crate::error::Result;
1313
use regex::Regex;
1414
use serde_derive::{Deserialize, Serialize};
1515

0 commit comments

Comments
 (0)