admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further clippy fixes (#176)

Browse Source
This commit is contained in:
Guilherme Silva
2022-11-13 07:29:33 -03:00
committed by Thomas Schönauer
parent 761ffac127
commit 7442ddd386
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/steps/os/android.rs
View File

@@ -1,3 +1,4 @@
use crate::command::CommandExt;
use crate::execution_context::ExecutionContext;
use crate::terminal::print_separator;
use crate::utils::require;
@@ -21,8 +22,7 @@ pub fn upgrade_packages(ctx: &ExecutionContext) -> Result<()> {
}
command.status_checked()?;
if !is_nala {
if ctx.config().cleanup() {
if !is_nala && ctx.config().cleanup() {
ctx.run_type().execute(&pkg).arg("clean").status_checked()?;
let apt = require("apt")?;
@@ -33,7 +33,6 @@ pub fn upgrade_packages(ctx: &ExecutionContext) -> Result<()> {
}
command.status_checked()?;
}
}
Ok(())
}

12
src/steps/os/unix.rs
View File

@@ -14,23 +14,30 @@ use log::debug;
use crate::error::SkipStep;
use crate::execution_context::ExecutionContext;
use crate::executor::{Executor, RunType};
#[cfg(any(target_os = "linux", target_os = "macos"))]
use crate::executor::Executor;
use crate::executor::RunType;
use crate::terminal::print_separator;
#[cfg(not(target_os = "macos"))]
#[cfg(not(any(target_os = "android", target_os = "macos")))]
use crate::utils::require_option;
use crate::utils::{require, PathExt};
#[cfg(any(target_os = "linux", target_os = "macos"))]
const INTEL_BREW: &str = "/usr/local/bin/brew";
#[cfg(any(target_os = "linux", target_os = "macos"))]
const ARM_BREW: &str = "/opt/homebrew/bin/brew";
#[derive(Copy, Clone, Debug)]
#[allow(dead_code)]
#[cfg(any(target_os = "linux", target_os = "macos"))]
pub enum BrewVariant {
Path,
MacIntel,
MacArm,
}
#[cfg(any(target_os = "linux", target_os = "macos"))]
impl BrewVariant {
fn binary_name(self) -> &'static str {
match self {
@@ -223,6 +230,7 @@ pub fn upgrade_gnome_extensions(ctx: &ExecutionContext) -> Result<()> {
.status_checked()
}
#[cfg(any(target_os = "linux", target_os = "macos"))]
pub fn run_brew_formula(ctx: &ExecutionContext, variant: BrewVariant) -> Result<()> {
#[allow(unused_variables)]
let binary_name = require(variant.binary_name())?;