From dabe5adb57e6226258a32e539bfe7b62f9a7cd9b Mon Sep 17 00:00:00 2001 From: Morgante Pell Date: Wed, 14 Aug 2024 23:45:33 -0700 Subject: [PATCH] delete more code --- crates/cli/src/commands/install.rs | 2 +- crates/cli/src/updater.rs | 1 - crates/cli/src/utils.rs | 42 ++---------------------------- 3 files changed, 3 insertions(+), 42 deletions(-) diff --git a/crates/cli/src/commands/install.rs b/crates/cli/src/commands/install.rs index cd387c9eb..31df5e491 100644 --- a/crates/cli/src/commands/install.rs +++ b/crates/cli/src/commands/install.rs @@ -1,4 +1,4 @@ -use anyhow::{bail, Result}; +use anyhow::{Result}; use clap::Args; use log::info; use serde::Serialize; diff --git a/crates/cli/src/updater.rs b/crates/cli/src/updater.rs index 45deb8657..ccbea6631 100644 --- a/crates/cli/src/updater.rs +++ b/crates/cli/src/updater.rs @@ -3,7 +3,6 @@ use anyhow::{Context, Result}; use axoupdater::{AxoUpdater, ReleaseSource, ReleaseSourceType, Version}; use chrono::{DateTime, NaiveDateTime, Utc}; use colored::Colorize; -use futures_util::StreamExt; use indicatif::ProgressBar; use log::info; use marzano_auth::info::AuthInfo; diff --git a/crates/cli/src/utils.rs b/crates/cli/src/utils.rs index 9cb5bc986..381dac56e 100644 --- a/crates/cli/src/utils.rs +++ b/crates/cli/src/utils.rs @@ -1,50 +1,12 @@ -use clap::ValueEnum; + use git2::{Repository, StatusOptions}; use marzano_gritmodule::searcher::find_git_dir_from; -use serde::{Deserialize, Serialize}; + use std::{ - fmt::{Display, Formatter}, net::{SocketAddr, TcpListener}, path::PathBuf, }; -#[derive(Debug, PartialEq, PartialOrd, Clone, Copy, Serialize, Deserialize, ValueEnum)] -pub enum OperatingSystem { - #[serde(rename = "windows")] - Windows, - #[serde(rename = "linux")] - Linux, - #[serde(rename = "macos")] - MacOS, -} - -impl Display for OperatingSystem { - fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { - match self { - OperatingSystem::Windows => write!(f, "windows"), - OperatingSystem::Linux => write!(f, "linux"), - OperatingSystem::MacOS => write!(f, "macos"), - } - } -} - -#[derive(Debug, PartialEq, PartialOrd, Clone, Copy, Serialize, Deserialize, ValueEnum)] -pub enum Architecture { - #[serde(rename = "x64")] - X64, - #[serde(rename = "arm64")] - Arm64, -} - -impl Display for Architecture { - fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { - match self { - Architecture::X64 => write!(f, "x64"), - Architecture::Arm64 => write!(f, "arm64"), - } - } -} - #[allow(dead_code)] pub fn get_random_port() -> Option { let listener = TcpListener::bind(SocketAddr::from(([127, 0, 0, 1], 0))).ok()?;