From a4eebc6d852e8bf03d12da133ebf36885e6bdcb6 Mon Sep 17 00:00:00 2001 From: Michal S Date: Fri, 19 Aug 2022 20:49:33 +0100 Subject: [PATCH] FMT --- src/internal/error.rs | 2 +- src/internal/mod.rs | 9 ++++----- src/internal/sudoloop.rs | 3 ++- src/internal/utils.rs | 2 +- src/operations/upgrade.rs | 6 ++++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/internal/error.rs b/src/internal/error.rs index 99977ad..b29a86d 100644 --- a/src/internal/error.rs +++ b/src/internal/error.rs @@ -1,9 +1,9 @@ -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; diff --git a/src/internal/mod.rs b/src/internal/mod.rs index 87befd6..91008f5 100644 --- a/src/internal/mod.rs +++ b/src/internal/mod.rs @@ -1,8 +1,12 @@ pub use clean::*; +pub use clean::*; pub use detect::*; pub use initialise::*; +pub use initialise::*; +pub use sort::*; pub use sort::*; use std::env; +pub use sudoloop::*; mod clean; pub mod commands; @@ -17,11 +21,6 @@ pub mod structs; pub(crate) mod utils; mod sudoloop; -pub use clean::*; -pub use initialise::*; -pub use sort::*; -pub use sudoloop::*; - #[macro_export] macro_rules! uwu { ($x:expr) => {{ diff --git a/src/internal/sudoloop.rs b/src/internal/sudoloop.rs index a4f6b3a..147a503 100644 --- a/src/internal/sudoloop.rs +++ b/src/internal/sudoloop.rs @@ -1,7 +1,8 @@ -use crate::ShellCommand; use std::thread; use std::time::Duration; +use crate::ShellCommand; + /// Loop sudo so it doesn't time out pub fn start_sudoloop() { prompt_sudo(); diff --git a/src/internal/utils.rs b/src/internal/utils.rs index c96485a..eadb0ec 100644 --- a/src/internal/utils.rs +++ b/src/internal/utils.rs @@ -1,3 +1,4 @@ +use colored::*; use std::io; use std::io::Write; use std::process::exit; @@ -5,7 +6,6 @@ use std::time::UNIX_EPOCH; use crate::internal::exit_code::AppExitCode; use crate::{internal, uwu}; -use colored::*; const OK_SYMBOL: &str = "❖"; const ERR_SYMBOL: &str = "❌"; diff --git a/src/operations/upgrade.rs b/src/operations/upgrade.rs index 32c20d7..6da764d 100644 --- a/src/operations/upgrade.rs +++ b/src/operations/upgrade.rs @@ -1,8 +1,8 @@ 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::internal::detect; use crate::operations::aur_install::aur_install; use crate::{info, log, prompt, Options}; @@ -107,7 +107,9 @@ pub fn upgrade(options: Options) { "Found AUR packages {} have new versions available, upgrade?", aur_upgrades.join(", "), ); - if cont { aur_install(aur_upgrades, options); }; + if cont { + aur_install(aur_upgrades, options); + }; } else { info!("No upgrades available for installed AUR packages"); }