From cb2bdea521f5d6ca149317f62cb08262d721ffa3 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Fri, 12 Apr 2024 20:41:51 -0500 Subject: [PATCH] refactor(resolve): Pull put locking message --- src/cargo/ops/cargo_generate_lockfile.rs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/cargo/ops/cargo_generate_lockfile.rs b/src/cargo/ops/cargo_generate_lockfile.rs index f93e782c0..cf03f2abf 100644 --- a/src/cargo/ops/cargo_generate_lockfile.rs +++ b/src/cargo/ops/cargo_generate_lockfile.rs @@ -212,9 +212,7 @@ fn print_lockfile_generation( // just ourself, nothing worth reporting return Ok(()); } - ws.gctx() - .shell() - .status("Locking", format!("{num_pkgs} packages"))?; + status_locking(ws, num_pkgs)?; for diff in diff { fn format_latest(version: semver::Version) -> String { @@ -271,10 +269,7 @@ fn print_lockfile_sync( if num_pkgs == 0 { return Ok(()); } - let plural = if num_pkgs == 1 { "" } else { "s" }; - ws.gctx() - .shell() - .status("Locking", format!("{num_pkgs} package{plural}"))?; + status_locking(ws, num_pkgs)?; for diff in diff { fn format_latest(version: semver::Version) -> String { @@ -488,6 +483,14 @@ fn print_lockfile_updates( Ok(()) } +fn status_locking(ws: &Workspace<'_>, num_pkgs: usize) -> CargoResult<()> { + let plural = if num_pkgs == 1 { "" } else { "s" }; + ws.gctx() + .shell() + .status("Locking", format!("{num_pkgs} package{plural}"))?; + Ok(()) +} + fn is_latest(candidate: &semver::Version, current: &semver::Version) -> bool { current < candidate // Only match pre-release if major.minor.patch are the same