From e6b2d06d9808f51a0e8b8360e07d06815bb3c481 Mon Sep 17 00:00:00 2001 From: Tassilo Horn Date: Thu, 28 Oct 2021 20:30:27 +0200 Subject: [PATCH] Update deps and adapt to clap 3.0.0-beta.5 --- Cargo.lock | 48 +++++++++++++++++++++++++++--------------------- src/bin/swayr.rs | 6 +++--- src/cmds.rs | 8 +++----- 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 93286b8..b7f9fb8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -42,9 +42,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "3.0.0-beta.4" +version = "3.0.0-beta.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcd70aa5597dbc42f7217a543f9ef2768b2ef823ba29036072d30e1d88e98406" +checksum = "feff3878564edb93745d58cf63e17b63f24142506e7a20c87a5521ed7bfb1d63" dependencies = [ "atty", "bitflags", @@ -55,14 +55,14 @@ dependencies = [ "strsim", "termcolor", "textwrap", - "vec_map", + "unicase", ] [[package]] name = "clap_derive" -version = "3.0.0-beta.4" +version = "3.0.0-beta.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5bb0d655624a0b8770d1c178fb8ffcb1f91cc722cb08f451e3dc72465421ac" +checksum = "8b15c6b4f786ffb6192ffe65a36855bc1fc2444bcd0945ae16748dcd6ed7d0d3" dependencies = [ "heck", "proc-macro-error", @@ -150,9 +150,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.103" +version = "0.2.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" +checksum = "869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013" [[package]] name = "memchr" @@ -162,15 +162,18 @@ checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "os_str_bytes" -version = "3.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d" +checksum = "addaa943333a514159c80c97ff4a93306530d965d27e139188283cd13e06a799" +dependencies = [ + "memchr", +] [[package]] name = "ppv-lite86" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ca011bd0129ff4ae15cd04c4eef202cadf6c51c21e47aba319b4e0501db741" +checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" [[package]] name = "proc-macro-error" @@ -198,9 +201,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.30" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70" +checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" dependencies = [ "unicode-xid", ] @@ -372,9 +375,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194" +checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" dependencies = [ "proc-macro2", "quote", @@ -428,6 +431,15 @@ dependencies = [ "serde", ] +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + [[package]] name = "unicode-segmentation" version = "1.8.0" @@ -446,12 +458,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version_check" version = "0.9.3" diff --git a/src/bin/swayr.rs b/src/bin/swayr.rs index ba5dde3..1a4bd95 100644 --- a/src/bin/swayr.rs +++ b/src/bin/swayr.rs @@ -15,14 +15,14 @@ //! The `swayr` binary. -use clap::{crate_version, Clap}; +use clap::Parser; /// Windows are sorted urgent first, then windows in LRU order, focused window /// last. Licensed under the GPLv3 (or later). -#[derive(Clap)] +#[derive(clap::Parser)] #[clap( name = "swayr -- a window switcher (and more) for sway", - version = crate_version!(), + version = clap::crate_version!(), author = "Tassilo Horn " )] struct Opts { diff --git a/src/cmds.rs b/src/cmds.rs index 5f3409a..a55109c 100644 --- a/src/cmds.rs +++ b/src/cmds.rs @@ -21,8 +21,6 @@ use crate::config as cfg; use crate::layout; use crate::util; use crate::util::DisplayFormat; -use clap::Clap; -use rand; use rand::prelude::SliceRandom; use serde::{Deserialize, Serialize}; use std::collections::HashMap; @@ -31,7 +29,7 @@ use std::sync::Arc; use std::sync::RwLock; use swayipc as s; -#[derive(Clap, Debug, Deserialize, Serialize, PartialEq, Clone)] +#[derive(clap::Parser, Debug, Deserialize, Serialize, PartialEq, Clone)] pub enum ConsiderFloating { /// Include floating windows. IncludeFloating, @@ -39,7 +37,7 @@ pub enum ConsiderFloating { ExcludeFloating, } -#[derive(Clap, Debug, Deserialize, Serialize, PartialEq, Clone)] +#[derive(clap::Parser, Debug, Deserialize, Serialize, PartialEq, Clone)] pub enum ConsiderWindows { /// Consider windows of all workspaces. AllWorkspaces, @@ -47,7 +45,7 @@ pub enum ConsiderWindows { CurrentWorkspace, } -#[derive(Clap, Debug, Deserialize, Serialize)] +#[derive(clap::Parser, Debug, Deserialize, Serialize)] pub enum SwayrCommand { /// Switch to next urgent window (if any) or to last recently used window. SwitchToUrgentOrLRUWindow,