From 7d42ba4e521f9123f0ef2df83d08bd4f886c4a27 Mon Sep 17 00:00:00 2001 From: Roey Darwish Dror Date: Sat, 18 Dec 2021 20:39:57 +0200 Subject: [PATCH] Remove pacdiff --- src/config.rs | 1 - src/main.rs | 37 ++++++++++++++++++------------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/config.rs b/src/config.rs index a6f3e9fc..fc15ba7f 100644 --- a/src/config.rs +++ b/src/config.rs @@ -99,7 +99,6 @@ pub enum Step { Nix, Node, Opam, - Pacdiff, Pacstall, Pearl, Pipx, diff --git a/src/main.rs b/src/main.rs index 5d2cf72e..45f3a77c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,22 @@ #![allow(clippy::cognitive_complexity)] + +use std::env; +use std::io; +use std::process::exit; + +use anyhow::{anyhow, Result}; +use console::Key; +use log::debug; +use structopt::clap::crate_version; +use structopt::StructOpt; + +use self::config::{CommandLineArgs, Config, Step}; +use self::error::StepFailed; +#[cfg(all(windows, feature = "self-update"))] +use self::error::Upgraded; +use self::steps::{remote::*, *}; +use self::terminal::*; + mod config; mod ctrlc; mod error; @@ -14,23 +32,6 @@ mod steps; mod terminal; mod utils; -use self::config::{CommandLineArgs, Config, Step}; -use self::error::StepFailed; -#[cfg(all(windows, feature = "self-update"))] -use self::error::Upgraded; - -use self::steps::{remote::*, *}; -use self::terminal::*; -use anyhow::{anyhow, Result}; -use console::Key; -use log::debug; - -use std::env; -use std::io; -use std::process::exit; -use structopt::clap::crate_version; -use structopt::StructOpt; - fn run() -> Result<()> { ctrlc::set_handler(); @@ -138,8 +139,6 @@ fn run() -> Result<()> { linux::run_config_update(sudo.as_ref(), run_type) })?; - runner.execute(Step::Pacdiff, "pacdiff", || linux::run_pacdiff(sudo.as_ref(), run_type))?; - runner.execute(Step::BrewFormula, "Brew", || { unix::run_brew_formula(&ctx, unix::BrewVariant::Linux) })?;