From 62652b3459b4b68e62fcf5a12e78a01784fdab73 Mon Sep 17 00:00:00 2001 From: Michal Date: Mon, 4 Jul 2022 15:46:20 +0000 Subject: [PATCH] Import optimisation --- Cargo.lock | 2 +- src/args.rs | 14 +++++++------- src/database/add.rs | 3 +-- src/database/initialise.rs | 3 +-- src/database/mod.rs | 10 +++++----- src/database/query.rs | 3 +-- src/database/remove.rs | 3 +-- src/internal/commands.rs | 5 +++-- src/internal/error.rs | 5 +++-- src/internal/initialise.rs | 2 +- src/internal/mod.rs | 14 +++++++------- src/main.rs | 5 ++--- src/operations/mod.rs | 14 +++++++------- 13 files changed, 40 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 38d087d..0e8ab9d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "Amethyst" -version = "3.2.0" +version = "3.3.0" dependencies = [ "clap", "libc", diff --git a/src/args.rs b/src/args.rs index c8c2a73..9205c9a 100644 --- a/src/args.rs +++ b/src/args.rs @@ -1,7 +1,7 @@ use clap::{Parser, Subcommand}; #[derive(Debug, Clone, Parser)] -#[clap(name="Amethyst", version=env!("CARGO_PKG_VERSION"), about=env!("CARGO_PKG_DESCRIPTION"))] +#[clap(name = "Amethyst", version = env ! ("CARGO_PKG_VERSION"), about = env ! ("CARGO_PKG_DESCRIPTION"))] pub struct Args { #[clap(subcommand)] pub subcommand: Option, @@ -18,27 +18,27 @@ pub struct Args { #[derive(Debug, Clone, Subcommand)] pub enum Operation { /// Installs a package from either the AUR or the PacMan-defined repositories - #[clap(name="install", aliases=&["ins", "in", "i", "-S"])] + #[clap(name = "install", aliases = & ["ins", "in", "i", "-S"])] Install(InstallArgs), /// Removes a previously installed package - #[clap(name="remove", aliases=&["rm", "r", "-R", "-Rs"])] + #[clap(name = "remove", aliases = & ["rm", "r", "-R", "-Rs"])] Remove(RemoveArgs), /// Searches for the relevant packages in both the AUR and repos - #[clap(name="search", aliases=&["sea", "se", "s", "-Ss"])] + #[clap(name = "search", aliases = & ["sea", "se", "s", "-Ss"])] Search(SearchArgs), /// Queries installed packages - #[clap(name="query", aliases=&["ls", "l", "-Q"])] + #[clap(name = "query", aliases = & ["ls", "l", "-Q"])] Query(QueryArgs), /// Upgrades locally installed packages to their latest versions - #[clap(name="upgrade", aliases=&["upg", "up", "u", "-Syu"])] + #[clap(name = "upgrade", aliases = & ["upg", "up", "u", "-Syu"])] Upgrade, /// Removes all orphaned packages - #[clap(name="clean", aliases=&["cln", "cl", "-Sc"])] + #[clap(name = "clean", aliases = & ["cln", "cl", "-Sc"])] Clean, } diff --git a/src/database/add.rs b/src/database/add.rs index 07cbd9a..b722099 100644 --- a/src/database/add.rs +++ b/src/database/add.rs @@ -1,8 +1,7 @@ +use rusqlite::Connection; use std::env; use std::path::Path; -use rusqlite::Connection; - use crate::internal::exit_code::AppExitCode; use crate::internal::rpc::Package; use crate::{crash, log, Options}; diff --git a/src/database/initialise.rs b/src/database/initialise.rs index 89105d7..b0e272a 100644 --- a/src/database/initialise.rs +++ b/src/database/initialise.rs @@ -1,8 +1,7 @@ +use rusqlite::Connection; use std::env; use std::path::Path; -use rusqlite::Connection; - use crate::internal::exit_code::AppExitCode; use crate::{crash, log, Options}; diff --git a/src/database/mod.rs b/src/database/mod.rs index 705843c..bbdfd08 100644 --- a/src/database/mod.rs +++ b/src/database/mod.rs @@ -1,9 +1,9 @@ -mod add; -mod initialise; -mod query; -mod remove; - pub use add::*; pub use initialise::*; pub use query::*; pub use remove::*; + +mod add; +mod initialise; +mod query; +mod remove; diff --git a/src/database/query.rs b/src/database/query.rs index d12470d..112db3a 100644 --- a/src/database/query.rs +++ b/src/database/query.rs @@ -1,8 +1,7 @@ +use rusqlite::Connection; use std::env; use std::path::Path; -use rusqlite::Connection; - use crate::internal::rpc::Package; use crate::{log, Options}; diff --git a/src/database/remove.rs b/src/database/remove.rs index c213e3b..3b5de42 100644 --- a/src/database/remove.rs +++ b/src/database/remove.rs @@ -1,8 +1,7 @@ +use rusqlite::Connection; use std::env; use std::path::Path; -use rusqlite::Connection; - use crate::{log, Options}; pub fn remove(pkg: &str, options: Options) { diff --git a/src/internal/commands.rs b/src/internal/commands.rs index 09cba04..660e314 100644 --- a/src/internal/commands.rs +++ b/src/internal/commands.rs @@ -1,8 +1,9 @@ -use crate::internal::error::{AppError, AppResult}; -use crate::internal::is_tty; use std::ffi::{OsStr, OsString}; use std::process::{Child, Command, ExitStatus, Stdio}; +use crate::internal::error::{AppError, AppResult}; +use crate::internal::is_tty; + pub struct StringOutput { pub stdout: String, pub stderr: String, diff --git a/src/internal/error.rs b/src/internal/error.rs index 02e3010..957603c 100644 --- a/src/internal/error.rs +++ b/src/internal/error.rs @@ -1,9 +1,10 @@ -use crate::crash; -use crate::internal::exit_code::AppExitCode; use std::error::Error; use std::fmt::{Debug, Display, Formatter}; use std::io; +use crate::crash; +use crate::internal::exit_code::AppExitCode; + pub type AppResult = Result; #[derive(Debug)] diff --git a/src/internal/initialise.rs b/src/internal/initialise.rs index 200f14a..71a9df5 100644 --- a/src/internal/initialise.rs +++ b/src/internal/initialise.rs @@ -1,8 +1,8 @@ -use crate::internal::exit_code::AppExitCode; use std::env; use std::path::Path; use std::process::Command; +use crate::internal::exit_code::AppExitCode; use crate::internal::strings::{crash, log}; use crate::Options; diff --git a/src/internal/mod.rs b/src/internal/mod.rs index ca87eca..f0a69f6 100644 --- a/src/internal/mod.rs +++ b/src/internal/mod.rs @@ -1,3 +1,10 @@ +pub use clean::*; +pub use detect::*; +pub use initialise::*; +pub use sort::*; +use std::env; +pub use strings::*; + mod clean; pub mod commands; mod detect; @@ -9,13 +16,6 @@ mod sort; mod strings; pub mod structs; -pub use clean::*; -pub use detect::*; -pub use initialise::*; -pub use sort::*; -use std::env; -pub use strings::*; - #[macro_export] macro_rules! uwu { ($x:expr) => {{ diff --git a/src/main.rs b/src/main.rs index 063209d..a6482af 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,10 +1,9 @@ -use clap::Parser; - -use crate::args::{InstallArgs, Operation, QueryArgs, RemoveArgs, SearchArgs}; use args::Args; +use clap::Parser; use internal::commands::ShellCommand; use internal::error::SilentUnwrap; +use crate::args::{InstallArgs, Operation, QueryArgs, RemoveArgs, SearchArgs}; use crate::internal::detect; use crate::internal::exit_code::AppExitCode; #[allow(unused_imports)] diff --git a/src/operations/mod.rs b/src/operations/mod.rs index 6966d43..ef348bb 100644 --- a/src/operations/mod.rs +++ b/src/operations/mod.rs @@ -1,13 +1,13 @@ -mod aur_install; -mod clean; -mod install; -mod search; -mod uninstall; -mod upgrade; - pub use aur_install::*; pub use clean::*; pub use install::*; pub use search::{aur_search, repo_search as search}; pub use uninstall::*; pub use upgrade::*; + +mod aur_install; +mod clean; +mod install; +mod search; +mod uninstall; +mod upgrade;