From 325edde1ebceb509ac13f7ee97ab320368c3336d Mon Sep 17 00:00:00 2001 From: Dotan Nahum Date: Sun, 17 Dec 2023 09:14:56 +0200 Subject: [PATCH] updates --- Cargo.lock | 32 ++++++++++++------------- starter_project/Cargo.toml | 4 ++-- starter_project/src/bin/cmd/mod.rs | 4 ++-- starter_project/src/data.rs | 2 +- starter_project_lib/Cargo.toml | 6 +---- starter_project_simpler/Cargo.toml | 4 ++-- starter_project_simpler/src/argh_ext.rs | 3 +-- starter_project_simpler/src/data.rs | 2 +- 8 files changed, 25 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e003c25..245947c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -633,6 +633,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "nu-ansi-term" +version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "once_cell" version = "1.19.0" @@ -1164,17 +1173,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-log" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -1193,7 +1191,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", - "nu-ansi-term", + "nu-ansi-term 0.46.0", "once_cell", "regex", "sharded-slab", @@ -1201,18 +1199,18 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", ] [[package]] name = "tracing-tree" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ec6adcab41b1391b08a308cc6302b79f8095d1673f6947c2dc65ffb028b0b2d" +checksum = "65139ecd2c3f6484c3b99bc01c77afe21e95473630747c7aca525e78b0666675" dependencies = [ - "nu-ansi-term", + "nu-ansi-term 0.49.0", "tracing-core", - "tracing-log 0.1.4", + "tracing-log", "tracing-subscriber", ] diff --git a/starter_project/Cargo.toml b/starter_project/Cargo.toml index cf29252..41626da 100644 --- a/starter_project/Cargo.toml +++ b/starter_project/Cargo.toml @@ -52,7 +52,7 @@ pkg-fmt = "txz" [dependencies] clap = { version = "4", features = ["cargo"], optional = true } -serde = "1" +serde = { version = "1", features = ["derive"] } serde_json = "1" serde_derive = "1" serde_yaml = "^0.9.0" @@ -60,7 +60,7 @@ anyhow = "1" console = "^0.15.0" exitcode = "^1.1.2" tracing = "^0.1.34" -tracing-tree = { version = "0.2.1" } +tracing-tree = { version = "0.3.0" } tracing-subscriber = { version = "^0.3.11", features = ["env-filter"] } diff --git a/starter_project/src/bin/cmd/mod.rs b/starter_project/src/bin/cmd/mod.rs index 73e878a..f0387ef 100644 --- a/starter_project/src/bin/cmd/mod.rs +++ b/starter_project/src/bin/cmd/mod.rs @@ -12,9 +12,9 @@ use tracing_subscriber::prelude::__tracing_subscriber_SubscriberExt; use tracing_subscriber::util::SubscriberInitExt; use tracing_subscriber::{EnvFilter, Registry}; -pub const BANNER: &str = r#" +pub const BANNER: &str = r" B A N N E R -"#; +"; pub fn banner(v: &str, matches: &ArgMatches) { if !matches.get_flag("no_banner") { println!( diff --git a/starter_project/src/data.rs b/starter_project/src/data.rs index 4b303f4..42d6e12 100644 --- a/starter_project/src/data.rs +++ b/starter_project/src/data.rs @@ -14,7 +14,7 @@ pub struct CmdExit { pub message: Option, } -pub const CMD: &str = r#"hello"#; +pub const CMD: &str = r"hello"; #[cfg(test)] mod tests { diff --git a/starter_project_lib/Cargo.toml b/starter_project_lib/Cargo.toml index 8774be0..fb02b72 100644 --- a/starter_project_lib/Cargo.toml +++ b/starter_project_lib/Cargo.toml @@ -12,10 +12,6 @@ edition = "2021" # license = "Apache-2.0" # readme = "../README.md" -[[example]] -name = "demo" -required-features = ["default"] - [dependencies] serde = { version = "1", features = ["derive"] } # serde_json = "1" @@ -24,7 +20,7 @@ serde = { version = "1", features = ["derive"] } # thiserror = "1" [dev-dependencies] -insta = { version = "1.17.1", features = ["backtrace", "redactions"] } +insta = { version = "1.17.1", features = ["yaml", "redactions"] } pretty_assertions = "1" clap = "4.1.8" # rstest = "^0.14.0" diff --git a/starter_project_simpler/Cargo.toml b/starter_project_simpler/Cargo.toml index f1c27e0..7cf1ed5 100644 --- a/starter_project_simpler/Cargo.toml +++ b/starter_project_simpler/Cargo.toml @@ -48,7 +48,7 @@ default = ["cli"] eyre = { version = "0.6.8", optional = true } argh = "0.1.10" regex = "1.7.0" -serde = "1" +serde = { version = "1", features = ["derive"] } serde_json = "1" serde_derive = "1" serde_yaml = "^0.9.0" @@ -60,7 +60,7 @@ console = "^0.15.0" # tracing-subscriber = { version = "^0.3.11", features = ["env-filter"] } [dev-dependencies] -insta = { version = "1.17.1", features = ["backtrace", "redactions"] } +insta = { version = "1.17.1", features = ["yaml", "redactions"] } pretty_assertions = "1" trycmd = "0.14.10" # rstest = "^0.14.0" diff --git a/starter_project_simpler/src/argh_ext.rs b/starter_project_simpler/src/argh_ext.rs index 8bc0eea..14255f4 100644 --- a/starter_project_simpler/src/argh_ext.rs +++ b/starter_project_simpler/src/argh_ext.rs @@ -42,8 +42,7 @@ where }; Err(argh::EarlyExit { output: format!( - "{} -V, --version print version information and exit", - help + "{help} -V, --version print version information and exit", ), status: Ok(()), }) diff --git a/starter_project_simpler/src/data.rs b/starter_project_simpler/src/data.rs index 825c8cf..b26528b 100644 --- a/starter_project_simpler/src/data.rs +++ b/starter_project_simpler/src/data.rs @@ -9,7 +9,7 @@ pub struct Definitions { pub providers: HashMap, } -pub const CMD: &str = r#"hello"#; +pub const CMD: &str = r"hello"; #[cfg(test)] mod tests {