updates

rusty-ferris-club · Dec 17, 2023 · 325edde · 325edde
1 parent 25287bb
commit 325edde
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/starter_project/Cargo.toml b/starter_project/Cargo.toml
@@ -52,15 +52,15 @@ 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"
 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
@@ -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
@@ -14,7 +14,7 @@ pub struct CmdExit {
     pub message: Option<String>,
 }
 
-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
@@ -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
@@ -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
@@ -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
@@ -9,7 +9,7 @@ pub struct Definitions {
     pub providers: HashMap<String, String>,
 }
 
-pub const CMD: &str = r#"hello"#;
+pub const CMD: &str = r"hello";
 
 #[cfg(test)]
 mod tests {