Skip to content

Commit

Permalink
Bump cargo dependencies (#160)
Browse files Browse the repository at this point in the history
* Bump dev-dependencies

* Bump dependencies

* Bump more dependencies

* Apply fmt and clippy

* Apply fmt and clippy

* Apply fmt and clippy
  • Loading branch information
diego-plan9 authored Aug 29, 2023
1 parent 3c6fb2b commit 9199d17
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 31 deletions.
19 changes: 9 additions & 10 deletions crates/lillinput-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,15 @@ categories = ["command-line-utilities", "gui"]
[dependencies]
clap = { version = "~3.2.17", features = ["derive"] }
clap-verbosity-flag = "~1.0.1"
config = "~0.13.2"
i3ipc = "~0.10"
config = "0.13"
i3ipc = "0.10"
lillinput = { path = "../lillinput", version = "0.3.0" }
log = { version = "~0.4.17", features = ["serde"] }
serde = { version = "~1.0", features = ["derive"] }
simplelog = "~0.12.0"
strum = { version = "~0.24", features = ["derive"] }
strum_macros = "~0.24"
xdg = "~2.4"
log = { version = "0.4.20", features = ["serde"] }
serde = { version = "1.0", features = ["derive"] }
simplelog = "0.12"
strum = { version = "0.25", features = ["derive"] }
xdg = "2.5"

[dev-dependencies]
tempfile = "~3.3"
serial_test = "~0.9.0"
tempfile = "3.8"
serial_test = "2.0"
4 changes: 2 additions & 2 deletions crates/lillinput-cli/src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ pub fn setup_application(opts: Opts, initialize_logging: bool) -> Result<Setting
for (key, value) in &mut final_settings.actions {
let mut prune = false;
// Check each action string, for debugging purposes.
for entry in value.iter() {
for entry in &*value {
if !enabled_action_types.contains(&entry.type_) {
log_entries.push(LogEntry::warn(format!(
"Removing malformed or disabled action in {key}: {entry}",
Expand Down Expand Up @@ -363,7 +363,7 @@ pub fn extract_action_map(
if let Some(arguments) = settings.actions.get(&action_event.to_string()) {
let mut actions_list: Vec<Box<dyn Action>> = vec![];

for value in arguments.iter() {
for value in arguments {
// Create the new actions.
match ActionType::from_str(&value.type_) {
Ok(ActionType::Command) => {
Expand Down
21 changes: 10 additions & 11 deletions crates/lillinput/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,16 @@ keywords = ["i3", "touchpad", "x11", "libinput", "gestures"]
categories = ["command-line-utilities", "gui"]

[dependencies]
filedescriptor = "~0.8"
i3ipc = "~0.10"
filedescriptor = "0.8"
i3ipc = "0.10"
input = "~0.7"
itertools = "~0.10"
libc = "~0.2"
log = { version = "~0.4.17" }
shlex = "~1.1"
strum = { version = "~0.24", features = ["derive"] }
strum_macros = "~0.24"
thiserror = "~1.0"
itertools = "0.11"
libc = "0.2"
log = { version = "0.4.20" }
shlex = "1.1"
strum = { version = "0.25", features = ["derive"] }
thiserror = "1.0"

[dev-dependencies]
tempfile = "~3.3"
serial_test = "~0.9.0"
tempfile = "3.8"
serial_test = "2.0"
10 changes: 5 additions & 5 deletions crates/lillinput/src/actions/i3action.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ impl Action for I3Action {

// Check if the i3 connection is valid.
let Some(connection) = connection_option else {
return Err(ActionError::ExecutionError {
type_: "i3".into(),
message: "i3 connection is not set".into(),
})
};
return Err(ActionError::ExecutionError {
type_: "i3".into(),
message: "i3 connection is not set".into(),
});
};

match connection.run_command(&self.command) {
Err(e) => Err(ActionError::ExecutionError {
Expand Down
2 changes: 1 addition & 1 deletion crates/lillinput/src/controllers/defaultcontroller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ impl Controller for DefaultController {
actions.len()
);

for action in actions.iter_mut() {
for action in &mut *actions {
match action.execute_command() {
Ok(_) => (),
Err(e) => warn!("Error execution action {action}: {e}"),
Expand Down
3 changes: 1 addition & 2 deletions crates/lillinput/src/events/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ pub use crate::events::defaultprocessor::DefaultProcessor;
pub use crate::events::errors::{LibinputError, ProcessorError};

use input::event::GestureEvent;
use strum::{Display, EnumString, EnumVariantNames};
use strum_macros::EnumIter;
use strum::{Display, EnumIter, EnumString, EnumVariantNames};

/// High-level application events that can trigger an action.
#[derive(
Expand Down

0 comments on commit 9199d17

Please sign in to comment.