From a127e2fcbbd9b82d3cae0f6a36609ec745e4651a Mon Sep 17 00:00:00 2001 From: daimond113 Date: Sat, 26 Apr 2025 23:59:29 +0200 Subject: [PATCH] refactor: remove unused imports --- src/cli/install.rs | 9 ++++----- src/cli/mod.rs | 4 ++-- src/linking/mod.rs | 2 +- src/main.rs | 19 +++++++++++-------- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/cli/install.rs b/src/cli/install.rs index a05954b..65b7221 100644 --- a/src/cli/install.rs +++ b/src/cli/install.rs @@ -11,18 +11,15 @@ use console::style; use fs_err::tokio as fs; use pesde::{ download_and_link::{DownloadAndLinkHooks, DownloadAndLinkOptions, InstallDependenciesMode}, - engine::EngineKind, graph::{DependencyGraph, DependencyGraphWithTarget}, lockfile::Lockfile, - manifest::{DependencyType, Manifest}, + manifest::DependencyType, names::PackageNames, source::{ - pesde::PesdePackageSource, - refs::PackageRefs, traits::{PackageRef as _, RefreshOptions}, PackageSources, }, - version_matches, Project, RefreshedSources, MANIFEST_FILE_NAME, + Project, RefreshedSources, }; use std::{ collections::{BTreeMap, BTreeSet, HashSet}, @@ -284,6 +281,8 @@ pub async fn install( #[cfg(feature = "version-management")] { + use pesde::{source::{refs::PackageRefs, pesde::PesdePackageSource}, MANIFEST_FILE_NAME, version_matches, manifest::Manifest, engine::EngineKind}; + let manifest_target_kind = manifest.target.kind(); let mut tasks = downloaded_graph.iter() .map(|(id, node)| { diff --git a/src/cli/mod.rs b/src/cli/mod.rs index 8eeb15b..6e98be3 100644 --- a/src/cli/mod.rs +++ b/src/cli/mod.rs @@ -23,7 +23,6 @@ use pesde::{ Project, DEFAULT_INDEX_NAME, }; use relative_path::RelativePathBuf; -use reporters::run_with_reporter; use semver::Version; use std::{ collections::{BTreeMap, HashMap, HashSet}, @@ -59,6 +58,7 @@ pub fn bin_dir() -> anyhow::Result { Ok(base_dir()?.join("bin")) } +#[cfg(feature = "version-management")] pub fn engines_dir() -> anyhow::Result { Ok(base_dir()?.join("engines")) } @@ -375,7 +375,7 @@ pub async fn get_project_engines( ) -> anyhow::Result> { use tokio::task::JoinSet; - run_with_reporter(|_, root_progress, reporter| async { + crate::cli::reporters::run_with_reporter(|_, root_progress, reporter| async { let root_progress = root_progress; let reporter = reporter; diff --git a/src/linking/mod.rs b/src/linking/mod.rs index 78f1c92..da04291 100644 --- a/src/linking/mod.rs +++ b/src/linking/mod.rs @@ -29,7 +29,7 @@ pub mod incremental; async fn create_and_canonicalize>(path: P) -> std::io::Result { let p = path.as_ref(); fs::create_dir_all(p).await?; - p.canonicalize() + fs::canonicalize(p).await } async fn write_cas(destination: PathBuf, cas_dir: &Path, contents: &str) -> std::io::Result<()> { diff --git a/src/main.rs b/src/main.rs index 9f8e330..4fe67a7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -7,10 +7,9 @@ use cli::{compatible_runtime, data_dir, get_project_engines}; use fs_err::tokio as fs; use indicatif::MultiProgress; use pesde::{ - engine::EngineKind, find_roots, manifest::target::TargetKind, version_matches, AuthConfig, - Project, MANIFEST_FILE_NAME, + engine::EngineKind, find_roots, manifest::target::TargetKind, AuthConfig, Project, + MANIFEST_FILE_NAME, }; -use semver::VersionReq; use std::{ collections::HashMap, io, @@ -332,17 +331,21 @@ async fn run() -> anyhow::Result<()> { if engine == EngineKind::Pesde { match &req { // we're already running a compatible version - Some(req) if version_matches(req, ¤t_version()) => break 'engines, + Some(req) if pesde::version_matches(req, ¤t_version()) => break 'engines, // the user has not requested a specific version, so we'll just use the current one None => break 'engines, _ => (), } } - let exe_path = - get_or_download_engine(&reqwest, engine, req.unwrap_or(VersionReq::STAR), ().into()) - .await? - .0; + let exe_path = get_or_download_engine( + &reqwest, + engine, + req.unwrap_or(semver::VersionReq::STAR), + ().into(), + ) + .await? + .0; if exe_path == current_exe { anyhow::bail!("engine linker executed by itself") }