diff --git a/src/args.rs b/src/args.rs index 3e39ffc..5c1056d 100644 --- a/src/args.rs +++ b/src/args.rs @@ -1,5 +1,4 @@ -use clap::Arg; -use clap::Command; +use clap::{Arg, Command}; pub const EDIT: &str = "edit"; pub const GROUPS: &str = "groups"; diff --git a/src/db.rs b/src/db.rs index e13e915..47de6e6 100644 --- a/src/db.rs +++ b/src/db.rs @@ -1,7 +1,9 @@ -use crate::Package; +use std::collections::HashSet; + use alpm::Alpm; use alpm::PackageReason::Explicit; -use std::collections::HashSet; + +use crate::Package; pub fn get_all_installed_packages() -> HashSet { convert_to_pacdef_packages(get_all_installed_packages_alpm()) diff --git a/src/group.rs b/src/group.rs index 8c8e58e..0ed59a6 100644 --- a/src/group.rs +++ b/src/group.rs @@ -1,10 +1,11 @@ -use crate::package::Package; use std::collections::HashSet; use std::fs::File; use std::hash::Hash; use std::io::BufRead; use std::{io::BufReader, path::PathBuf}; +use crate::package::Package; + pub const GROUPS_DIR: &str = "/home/ratajc72/.config/pacdef/groups"; #[derive(Debug)] diff --git a/src/main.rs b/src/main.rs index 7b986f3..3eb82c1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,16 +1,15 @@ -use pacdef::db::get_all_installed_packages; -use pacdef::group::GROUPS_DIR; use std::io::BufRead; use std::io::Write; use std::os::unix::process::CommandExt; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::process::exit; use std::{collections::HashSet, process::Command}; use clap::ArgMatches; + use pacdef::args; -use pacdef::db::get_explicitly_installed_packages; +use pacdef::db::{get_all_installed_packages, get_explicitly_installed_packages}; +use pacdef::group::GROUPS_DIR; use pacdef::Group; use pacdef::Package; diff --git a/src/package.rs b/src/package.rs index 5f714e2..b5ce0d4 100644 --- a/src/package.rs +++ b/src/package.rs @@ -1,10 +1,8 @@ use std::collections::HashSet; -use std::fmt::Display; -use std::fmt::Write; +use std::fmt::{Display, Write}; use std::fs::File; use std::hash::Hash; -use std::io::BufReader; -use std::io::Lines; +use std::io::{BufReader, Lines}; #[derive(Debug, Eq, PartialOrd, Ord)] pub struct Package {