Merge pull request #3 from fire332/fire332-tidy

Bump deps, format code, fix clippy warnings

Author: mariotaku

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 members = [
     "common/device",
     "common/connection",
@@ -11,6 +11,15 @@ members = [
     "ares-shell",
 ]
 
+[workspace.package]
+edition = "2024"
+license = "Apache-2.0"
+authors = ["Mariotaku Lee <mariotaku.lee@gmail.com>"]
+
+[workspace.lints.clippy]
+pedantic = { level = "warn", priority = -1 }
+upper_case_acronyms = "allow"
+
 [workspace.dependencies]
 clap = { version = "4.4.6", features = ["derive", "env"] }
 serde = { version = "1.0.214", features = ["derive"] }

Cargo.toml

@@ -1,30 +1,36 @@
 [package]
 name = "ares-device"
 version = "0.1.2"
-edition = "2021"
-authors = ["Mariotaku Lee <mariotaku.lee@gmail.com>"]
-license = "Apache-2.0"
+edition.workspace = true
+authors.workspace = true
+license.workspace = true
 description = "Tools for getting device information"
 
+[lints]
+workspace = true
+
 [dependencies]
 common-device = { path = "../common/device" }
 common-connection = { path = "../common/connection" }
 clap = { workspace = true }
-cfg-if = "1.0.0"
+cfg-if = "1.0.4"
 
 [target.'cfg(target_os="windows")'.dependencies]
 native-windows-gui = { version = "1.0.13" }
 native-windows-derive = "1.0.5"
-libssh-rs-sys = { workspace = true, features = ["vendored-openssl", "libz-sys"] }
+libssh-rs-sys = { workspace = true, features = [
+  "vendored-openssl",
+  "libz-sys",
+] }
 
 [target.'cfg(not(target_os="windows"))'.dependencies]
 libssh-rs-sys = { workspace = true, default-features = false }
 
 [target.'cfg(all(not(target_os="windows"), not(target_os="macos")))'.dependencies]
-gtk = "0.18.1"
+gtk = "0.18.2"
 
 [build-dependencies]
-embed-manifest = "1.4.0"
+embed-manifest = "1.5.0"
 
 [package.metadata.deb]
 section = "devel"

ares-device/Cargo.toml

@@ -4,11 +4,10 @@ extern crate native_windows_gui as nwg;
 use std::fmt::{Display, Formatter};
 use std::sync::Mutex;
 
+use ares_device_lib::Device;
 use nwd::NwgUi;
 use nwg::NativeUi;
 
-use ares_device_lib::Device;
-
 use crate::picker::PickPrompt;
 
 #[derive(Default)]

ares-device/src/picker/windows/mod.rs

@@ -1,13 +1,16 @@
 [package]
 name = "ares-install"
 version = "0.1.5"
-edition = "2021"
-authors = ["Mariotaku Lee <mariotaku.lee@gmail.com>"]
-license = "Apache-2.0"
+edition.workspace = true
+authors.workspace = true
+license.workspace = true
 description = "Install or Remove app from a device"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[lints]
+workspace = true
+
 [dependencies]
 common-device = { path = "../common/device" }
 common-connection = { path = "../common/connection" }
@@ -20,4 +23,4 @@ regex = { workspace = true }
 indicatif = { workspace = true }
 
 [package.metadata.deb]
-section = "devel"
+section = "devel"

ares-install/Cargo.toml

@@ -3,15 +3,14 @@ use std::io::{Error as IoError, ErrorKind};
 use std::path::Path;
 use std::time::Duration;
 
+use ares_connection_lib::luna::{Luna, LunaError, Message};
+use ares_connection_lib::session::DeviceSession;
+use ares_connection_lib::transfer::{FileTransfer, TransferError};
 use indicatif::{ProgressBar, ProgressStyle};
 use regex::Regex;
 use serde::{Deserialize, Serialize};
 use serde_json::Error as JsonError;
 
-use ares_connection_lib::luna::{Luna, LunaError, Message};
-use ares_connection_lib::session::DeviceSession;
-use ares_connection_lib::transfer::{FileTransfer, TransferError};
-
 pub(crate) trait InstallApp {
     fn install_app<P: AsRef<Path>>(&self, package: P) -> Result<(), InstallError>;
 }

ares-install/src/install.rs

@@ -1,8 +1,7 @@
+use ares_connection_lib::luna::{Luna, LunaEmptyPayload};
 use libssh_rs::Session;
 use serde::Deserialize;
 
-use ares_connection_lib::luna::{Luna, LunaEmptyPayload};
-
 pub(crate) trait ListApps {
     fn list_apps(&self);
 }

ares-install/src/list.rs

@@ -1,14 +1,14 @@
 use std::path::PathBuf;
 use std::process::exit;
 
-use clap::Parser;
-
-use crate::remove::RemoveApp;
 use ares_connection_lib::session::NewSession;
 use ares_device_lib::DeviceManager;
+use clap::Parser;
 use install::InstallApp;
 use list::ListApps;
 
+use crate::remove::RemoveApp;
+
 mod install;
 mod list;
 mod remove;

ares-install/src/main.rs

@@ -1,10 +1,9 @@
-use regex::Regex;
-use serde::Serialize;
-
 use ares_connection_lib::luna::Luna;
 use ares_connection_lib::session::DeviceSession;
+use regex::Regex;
+use serde::Serialize;
 
-use crate::install::{map_installer_message, InstallError};
+use crate::install::{InstallError, map_installer_message};
 
 pub(crate) trait RemoveApp {
     fn remove_app(&self, package_id: &str) -> Result<String, InstallError>;

ares-install/src/remove.rs

@@ -1,12 +1,15 @@
 [package]
 name = "ares-launch"
 version = "0.1.2"
-edition = "2021"
-authors = ["Mariotaku Lee <mariotaku.lee@gmail.com>"]
-license = "Apache-2.0"
+edition.workspace = true
+authors.workspace = true
+license.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[lints]
+workspace = true
+
 [dependencies]
 common-device = { path = "../common/device" }
 common-connection = { path = "../common/connection" }
@@ -16,4 +19,4 @@ serde_json = { workspace = true }
 libssh-rs = { workspace = true }
 
 [package.metadata.deb]
-section = "devel"
+section = "devel"