From 9f0d210021c54f63c9984446862b6ec68834bc63 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 22 Feb 2026 11:07:42 +0900 Subject: refactor(async): migrate from blocking HTTP to async/await with tokio Replace reqwest::blocking with async reqwest across the entire codebase. All command execute functions, registry API calls (packagist, downloader, resolver, lockfile), and the main entry point now use async/await with the tokio runtime. The pubgrub resolver runs on spawn_blocking since its DependencyProvider trait is synchronous, using Handle::block_on for async I/O within that context. Co-Authored-By: Claude Opus 4.6 --- crates/mozart/src/commands/remove.rs | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'crates/mozart/src/commands/remove.rs') diff --git a/crates/mozart/src/commands/remove.rs b/crates/mozart/src/commands/remove.rs index de4b77b..f869d12 100644 --- a/crates/mozart/src/commands/remove.rs +++ b/crates/mozart/src/commands/remove.rs @@ -96,7 +96,7 @@ pub struct RemoveArgs { pub apcu_autoloader_prefix: Option, } -pub fn execute( +pub async fn execute( args: &RemoveArgs, cli: &super::Cli, console: &mozart_core::console::Console, @@ -285,7 +285,7 @@ pub fn execute( console.info("Resolving dependencies..."); // Run resolver - let mut resolved = resolver::resolve(&request).map_err(|e| { + let mut resolved = resolver::resolve(&request).await.map_err(|e| { mozart_core::exit_code::bail( mozart_core::exit_code::DEPENDENCY_RESOLUTION_FAILED, e.to_string(), @@ -370,7 +370,8 @@ pub fn execute( composer_json: raw.clone(), include_dev: dev_mode, repo_cache: None, - })?; + }) + .await?; // Compute and print change report let changes = super::update::compute_update_changes(old_lock.as_ref(), &new_lock, dev_mode); @@ -468,7 +469,8 @@ pub fn execute( apcu_autoloader: false, apcu_autoloader_prefix: None, }, - )?; + ) + .await?; } Ok(()) @@ -681,9 +683,9 @@ mod tests { // ──────────── Integration tests (network, #[ignore]) ──────────── - #[test] + #[tokio::test] #[ignore] - fn test_remove_full_e2e() { + async fn test_remove_full_e2e() { use mozart_registry::lockfile::{LockFileGenerationRequest, generate_lock_file}; use mozart_registry::resolver::{ResolveRequest, resolve}; use std::collections::HashMap; @@ -714,7 +716,9 @@ mod tests { ignore_platform_req_list: vec![], repo_cache: None, }; - let resolved = resolve(&request).expect("initial resolution should succeed"); + let resolved = resolve(&request) + .await + .expect("initial resolution should succeed"); let initial_lock = generate_lock_file(&LockFileGenerationRequest { resolved_packages: resolved, composer_json_content: content.to_string(), @@ -722,6 +726,7 @@ mod tests { include_dev: false, repo_cache: None, }) + .await .expect("initial lock file generation should succeed"); initial_lock .write_to_file(&lock_path) @@ -745,7 +750,9 @@ mod tests { ignore_platform_req_list: vec![], repo_cache: None, }; - let resolved2 = resolve(&request2).expect("post-remove resolution should succeed"); + let resolved2 = resolve(&request2) + .await + .expect("post-remove resolution should succeed"); let composer_json_content2 = std::fs::read_to_string(&composer_path).unwrap(); let new_lock = generate_lock_file(&LockFileGenerationRequest { @@ -755,6 +762,7 @@ mod tests { include_dev: false, repo_cache: None, }) + .await .expect("post-remove lock file generation should succeed"); // psr/log should no longer be in the new lock -- cgit v1.3.1