Update dependencies

Author: qzed

Cargo.lock

@@ -11,24 +11,24 @@ edition = "2018"
 build = "build.rs"
 
 [dependencies]
-anyhow = "1.0.65"
+anyhow = "1.0.70"
 atty = "0.2.14"
-clap = { version = "3.2.22", features = ["cargo"] }
-dbus = "0.9.6"
-dbus-tokio = "0.7.5"
-dbus-crossroads = "0.5.1"
-futures = "0.3.24"
-libc = "0.2.134"
-nix = "0.25.0"
+clap = { version = "4.2.3", features = ["cargo"] }
+dbus = "0.9.7"
+dbus-tokio = "0.7.6"
+dbus-crossroads = "0.5.2"
+futures = "0.3.28"
+libc = "0.2.141"
+nix = "0.26.2"
 sdtx = { git = "https://github.com/linux-surface/libsurfacedtx", tag = "v0.1.3" }
 sdtx-tokio = { git = "https://github.com/linux-surface/libsurfacedtx", tag = "v0.1.3" }
-serde = { version = "1.0.145", features = ['derive'] }
-tokio = { version = "1.24.2", features = ["fs", "sync", "process", "signal", "io-util", "rt", "macros"] }
-toml = "0.5.9"
-serde_ignored = "0.1.5"
+serde = { version = "1.0.160", features = ['derive'] }
+tokio = { version = "1.27.0", features = ["fs", "sync", "process", "signal", "io-util", "rt", "macros"] }
+toml = "0.7.3"
+serde_ignored = "0.1.7"
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3.16", features = ["std", "env-filter"] }
 
 [build-dependencies]
-clap = "3.2.22"
-clap_complete = "3.2.5"
+clap = "4.2.3"
+clap_complete = "4.2.0"

surface-dtx-daemon/Cargo.toml

@@ -1,6 +1,6 @@
-use clap::{Arg, Command};
+use clap::{Arg, Command, ArgAction};
 
-pub fn app() -> Command<'static> {
+pub fn app() -> Command {
     Command::new("Surface DTX Daemon")
         .about(clap::crate_description!())
         .version(clap::crate_version!())
@@ -10,8 +10,9 @@ pub fn app() -> Command<'static> {
             .long("config")
             .value_name("FILE")
             .help("Use the specified config file")
-            .takes_value(true))
+            .value_parser(clap::value_parser!(std::path::PathBuf)))
         .arg(Arg::new("no-log-time")
             .long("no-log-time")
-            .help("Do not emit timestamps in log"))
+            .help("Do not emit timestamps in log")
+            .action(ArgAction::SetTrue))
 }

surface-dtx-daemon/src/cli.rs

@@ -102,7 +102,7 @@ impl Config {
         let data = std::str::from_utf8(&buf)
             .with_context(|| format!("Failed to read config file (path: {:?})", path.as_ref()))?;
 
-        let de = &mut toml::Deserializer::new(data);
+        let de = toml::Deserializer::new(data);
 
         let mut unknowns = BTreeSet::new();
         let mut config: Config = serde_ignored::deserialize(de, |path| {

surface-dtx-daemon/src/config.rs

@@ -13,7 +13,7 @@ mod service;
 use service::Service;
 
 
-use std::sync::{Arc, Mutex};
+use std::{sync::{Arc, Mutex}, path::PathBuf};
 
 use anyhow::{Context, Result};
 
@@ -34,7 +34,7 @@ fn bootstrap() -> Result<Config> {
     let matches = cli::app().get_matches();
 
     // set up config
-    let (config, diag) = match matches.value_of("config") {
+    let (config, diag) = match matches.get_one::<PathBuf>("config") {
         Some(path) => Config::load_file(path)?,
         None       => Config::load()?,
     };
@@ -50,7 +50,7 @@ fn bootstrap() -> Result<Config> {
         .with_env_filter(filter)
         .with_ansi(atty::is(atty::Stream::Stdout));
 
-    if matches.is_present("no-log-time") {
+    if matches.get_flag("no-log-time") {
         subscriber.without_time().init();
     } else {
         subscriber.init();

surface-dtx-daemon/src/main.rs

@@ -11,19 +11,19 @@ edition = "2018"
 build = "build.rs"
 
 [dependencies]
-anyhow = "1.0.65"
+anyhow = "1.0.70"
 atty = "0.2.14"
-clap = { version = "3.2.22", features = ["cargo"] }
-dbus = "0.9.6"
-dbus-tokio = "0.7.5"
-futures = "0.3.24"
-serde = { version = "1.0.145", features = ["derive"] }
-serde_ignored = "0.1.5"
-tokio = { version = "1.24.2", features = ["macros", "rt", "signal"] }
-toml = "0.5.9"
+clap = { version = "4.2.3", features = ["cargo"] }
+dbus = "0.9.7"
+dbus-tokio = "0.7.6"
+futures = "0.3.28"
+serde = { version = "1.0.160", features = ["derive"] }
+serde_ignored = "0.1.7"
+tokio = { version = "1.27.0", features = ["macros", "rt", "signal"] }
+toml = "0.7.3"
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3.16", features = ["std", "env-filter"] }
 
 [build-dependencies]
-clap = "3.2.22"
-clap_complete = "3.2.5"
+clap = "4.2.3"
+clap_complete = "4.2.0"

surface-dtx-userd/Cargo.toml

@@ -1,6 +1,6 @@
-use clap::{Arg, Command};
+use clap::{Arg, Command, ArgAction};
 
-pub fn app() -> Command<'static> {
+pub fn app() -> Command {
     Command::new("Surface DTX User Daemon")
         .about(clap::crate_description!())
         .version(clap::crate_version!())
@@ -10,8 +10,9 @@ pub fn app() -> Command<'static> {
             .long("config")
             .value_name("FILE")
             .help("Use the specified config file")
-            .takes_value(true))
+            .value_parser(clap::value_parser!(std::path::PathBuf)))
         .arg(Arg::new("no-log-time")
             .long("no-log-time")
-            .help("Do not emit timestamps in log"))
+            .help("Do not emit timestamps in log")
+            .action(ArgAction::SetTrue))
 }

surface-dtx-userd/src/cli.rs

@@ -66,7 +66,7 @@ impl Config {
         let data = std::str::from_utf8(&buf)
             .with_context(|| format!("Failed to read config file (path: {:?})", path.as_ref()))?;
 
-        let de = &mut toml::Deserializer::new(data);
+        let de = toml::Deserializer::new(data);
 
         let mut unknowns = BTreeSet::new();
         let mut config: Config = serde_ignored::deserialize(de, |path| {

surface-dtx-userd/src/config.rs

@@ -3,6 +3,8 @@ mod config;
 mod logic;
 mod utils;
 
+use std::path::PathBuf;
+
 use crate::config::Config;
 
 use anyhow::{Context, Result};
@@ -16,7 +18,7 @@ fn bootstrap() -> Result<Config> {
     let matches = cli::app().get_matches();
 
     // set up config
-    let (config, diag) = match matches.value_of("config") {
+    let (config, diag) = match matches.get_one::<PathBuf>("config") {
         Some(path) => Config::load_file(path)?,
         None       => Config::load()?,
     };
@@ -32,7 +34,7 @@ fn bootstrap() -> Result<Config> {
         .with_env_filter(filter)
         .with_ansi(atty::is(atty::Stream::Stdout));
 
-    if matches.is_present("no-log-time") {
+    if matches.get_flag("no-log-time") {
         subscriber.without_time().init();
     } else {
         subscriber.init();