diff --git a/src/internal/detect.rs b/src/internal/detect.rs index b9b88dd..2fb0b93 100644 --- a/src/internal/detect.rs +++ b/src/internal/detect.rs @@ -1,8 +1,9 @@ +use std::env; + use crate::internal::commands::ShellCommand; use crate::internal::error::SilentUnwrap; use crate::internal::exit_code::AppExitCode; -use crate::{prompt, warn, spinner}; -use std::env; +use crate::{prompt, spinner, warn}; pub fn detect() { // Start spinner diff --git a/src/internal/utils.rs b/src/internal/utils.rs index ee04076..16eca19 100644 --- a/src/internal/utils.rs +++ b/src/internal/utils.rs @@ -176,10 +176,8 @@ pub fn spinner_fn(text: String) -> Spinner { Spinner { spinner: spinoff::Spinner::new( spinoff::Spinners::Line, - format!("{}", - text.bold()), + format!("{}", text.bold()), spinoff::Color::Magenta, - ) + ), } } - diff --git a/src/main.rs b/src/main.rs index 6d447e0..ea0b389 100644 --- a/src/main.rs +++ b/src/main.rs @@ -6,9 +6,11 @@ use clap::Parser; use internal::commands::ShellCommand; use internal::error::SilentUnwrap; -use crate::args::{InstallArgs, Operation, QueryArgs, RemoveArgs, SearchArgs, UpgradeArgs, InfoArgs}; +use crate::args::{ + InfoArgs, InstallArgs, Operation, QueryArgs, RemoveArgs, SearchArgs, UpgradeArgs, +}; use crate::internal::exit_code::AppExitCode; -use crate::internal::{init, sort, start_sudoloop, structs::Options, detect}; +use crate::internal::{detect, init, sort, start_sudoloop, structs::Options}; #[global_allocator] static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc; @@ -102,7 +104,11 @@ fn cmd_install(args: InstallArgs, options: Options) { } for a in sorted.aur { info!("{}:", a); - let dir_bytes = std::process::Command::new("mktemp").arg("-d").output().unwrap().stdout; + let dir_bytes = std::process::Command::new("mktemp") + .arg("-d") + .output() + .unwrap() + .stdout; let dir = String::from_utf8(dir_bytes).unwrap(); std::process::Command::new("bash") .arg("-c") diff --git a/src/operations/aur_install.rs b/src/operations/aur_install.rs index 5ba3c97..4895bec 100644 --- a/src/operations/aur_install.rs +++ b/src/operations/aur_install.rs @@ -8,7 +8,7 @@ use crate::internal::commands::ShellCommand; use crate::internal::error::SilentUnwrap; use crate::internal::exit_code::AppExitCode; use crate::internal::rpc::rpcinfo; -use crate::{crash, info, log, warn, prompt, Options}; +use crate::{crash, info, log, prompt, warn, Options}; pub fn aur_install(a: Vec, options: Options) { // Initialise variables @@ -97,7 +97,8 @@ pub fn aur_install(a: Vec, options: Options) { .stdout .split_whitespace() .collect::>() - .iter().map(|s| s.to_string()) + .iter() + .map(|s| s.to_string()) .collect::>(); // Remove installed packages from sorted dependencies and makedepends @@ -213,9 +214,6 @@ pub fn aur_install(a: Vec, options: Options) { // If any packages failed to build, warn user with failed packages if !failed.is_empty() { - warn!( - "Failed to build packages {}", - failed.join(", ") - ); + warn!("Failed to build packages {}", failed.join(", ")); } } diff --git a/src/operations/upgrade.rs b/src/operations/upgrade.rs index 27f3cd3..b24c106 100644 --- a/src/operations/upgrade.rs +++ b/src/operations/upgrade.rs @@ -1,11 +1,11 @@ +use crate::args::UpgradeArgs; use crate::internal::commands::ShellCommand; use crate::internal::detect; use crate::internal::error::SilentUnwrap; use crate::internal::exit_code::AppExitCode; use crate::internal::rpc::rpcinfo; -use crate::args::UpgradeArgs; use crate::operations::aur_install::aur_install; -use crate::{info, log, prompt, warn, Options, spinner}; +use crate::{info, log, prompt, spinner, warn, Options}; #[derive(Debug)] struct QueriedPackage { @@ -50,9 +50,7 @@ pub fn upgrade(options: Options, args: UpgradeArgs) { info!("Successfully upgraded repo packages"); } else { // Otherwise warn user - warn!( - "Failed to upgrade repo packages.", - ); + warn!("Failed to upgrade repo packages.",); } } @@ -126,9 +124,9 @@ pub fn upgrade(options: Options, args: UpgradeArgs) { // If vector isn't empty, prompt to install AUR packages from vector, effectively upgrading if !aur_upgrades.is_empty() { let cont = prompt!(default true, - "Found AUR packages {} have new versions available, upgrade?", - aur_upgrades.join(", "), - ); + "Found AUR packages {} have new versions available, upgrade?", + aur_upgrades.join(", "), + ); if cont { aur_install(aur_upgrades, options); };