From bec36fce99c5ea739828f98d9a43adf760c6243b Mon Sep 17 00:00:00 2001 From: Ed Page Date: Mon, 15 Apr 2024 13:00:34 -0500 Subject: [PATCH] fix(update): Remove locking message for --precise We aren't locking to latest. We could customize the message for precise but it seemed a bit excessive. --- src/cargo/ops/cargo_generate_lockfile.rs | 13 +++++++++++-- tests/testsuite/artifact_dep.rs | 1 + tests/testsuite/git.rs | 1 - tests/testsuite/offline.rs | 1 - tests/testsuite/precise_pre_release.rs | 3 --- tests/testsuite/registry.rs | 2 -- tests/testsuite/update.rs | 14 -------------- 7 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/cargo/ops/cargo_generate_lockfile.rs b/src/cargo/ops/cargo_generate_lockfile.rs index 334e81755..fc22608e8 100644 --- a/src/cargo/ops/cargo_generate_lockfile.rs +++ b/src/cargo/ops/cargo_generate_lockfile.rs @@ -170,7 +170,13 @@ pub fn update_lockfile(ws: &Workspace<'_>, opts: &UpdateOptions<'_>) -> CargoRes true, )?; - print_lockfile_updates(ws, &previous_resolve, &resolve, &mut registry)?; + print_lockfile_updates( + ws, + &previous_resolve, + &resolve, + opts.precise.is_some(), + &mut registry, + )?; if opts.dry_run { opts.gctx .shell() @@ -356,11 +362,14 @@ fn print_lockfile_updates( ws: &Workspace<'_>, previous_resolve: &Resolve, resolve: &Resolve, + precise: bool, registry: &mut PackageRegistry<'_>, ) -> CargoResult<()> { let diff = PackageDiff::diff(&previous_resolve, &resolve); let num_pkgs: usize = diff.iter().map(|d| d.added.len()).sum(); - status_locking(ws, num_pkgs)?; + if !precise { + status_locking(ws, num_pkgs)?; + } let mut unchanged_behind = 0; for diff in diff { diff --git a/tests/testsuite/artifact_dep.rs b/tests/testsuite/artifact_dep.rs index 137c95ba1..e04fb1bdd 100644 --- a/tests/testsuite/artifact_dep.rs +++ b/tests/testsuite/artifact_dep.rs @@ -1590,6 +1590,7 @@ fn index_version_filtering() { .with_stderr( "\ [UPDATING] [..] +[LOCKING] 2 packages to latest compatible versions [ADDING] artifact v1.0.0 [UPDATING] bar v1.0.0 -> v1.0.1", ) diff --git a/tests/testsuite/git.rs b/tests/testsuite/git.rs index 2f5166e78..32cf02b0d 100644 --- a/tests/testsuite/git.rs +++ b/tests/testsuite/git.rs @@ -799,7 +799,6 @@ Caused by: .arg(&old_head.to_string()) .with_stderr( "\ -[LOCKING] 1 package to latest compatible version [UPDATING] bar v0.5.0 [..]", ) .run(); diff --git a/tests/testsuite/offline.rs b/tests/testsuite/offline.rs index 1160db0f4..8e6d4e193 100644 --- a/tests/testsuite/offline.rs +++ b/tests/testsuite/offline.rs @@ -702,7 +702,6 @@ fn main(){ .with_status(0) .with_stderr( "\ -[LOCKING] 1 package to latest compatible version [DOWNGRADING] present_dep v1.2.9 -> v1.2.3 ", ) diff --git a/tests/testsuite/precise_pre_release.rs b/tests/testsuite/precise_pre_release.rs index 107ef526b..b201858b6 100644 --- a/tests/testsuite/precise_pre_release.rs +++ b/tests/testsuite/precise_pre_release.rs @@ -65,7 +65,6 @@ fn update_pre_release() { .masquerade_as_nightly_cargo(&["precise-pre-release"]) .with_stderr( r#"[UPDATING] `dummy-registry` index -[LOCKING] 1 package to latest compatible version [UPDATING] my-dependency v0.1.1 -> v0.1.2-pre.0 "#, ) @@ -99,7 +98,6 @@ fn update_pre_release_differ() { .masquerade_as_nightly_cargo(&["precise-pre-release"]) .with_stderr( r#"[UPDATING] `dummy-registry` index -[LOCKING] 1 package to latest compatible version [DOWNGRADING] my-dependency v0.1.2 -> v0.1.2-pre.0 "#, ) @@ -109,7 +107,6 @@ fn update_pre_release_differ() { .masquerade_as_nightly_cargo(&["precise-pre-release"]) .with_stderr( r#"[UPDATING] `dummy-registry` index -[LOCKING] 1 package to latest compatible version [UPDATING] my-dependency v0.1.2-pre.0 -> v0.1.2-pre.1 "#, ) diff --git a/tests/testsuite/registry.rs b/tests/testsuite/registry.rs index 76d91c4b9..24c253c55 100644 --- a/tests/testsuite/registry.rs +++ b/tests/testsuite/registry.rs @@ -996,7 +996,6 @@ fn update_lockfile() { .with_stderr( "\ [UPDATING] `[..]` index -[LOCKING] 1 package to latest compatible version [UPDATING] bar v0.0.1 -> v0.0.2 ", ) @@ -3776,7 +3775,6 @@ fn differ_only_by_metadata_with_lockfile() { .with_stderr( "\ [UPDATING] [..] index -[LOCKING] 1 package to latest compatible version [..] baz v0.0.1+c -> v0.0.1+b ", ) diff --git a/tests/testsuite/update.rs b/tests/testsuite/update.rs index 05113393e..2c72ae341 100644 --- a/tests/testsuite/update.rs +++ b/tests/testsuite/update.rs @@ -405,7 +405,6 @@ fn update_precise() { .with_stderr( "\ [UPDATING] `[..]` index -[LOCKING] 1 package to latest compatible version [DOWNGRADING] serde v0.2.1 -> v0.2.0 [NOTE] pass `--verbose` to see 1 unchanged dependencies behind latest ", @@ -496,7 +495,6 @@ fn update_precise_build_metadata() { .with_stderr( "\ [UPDATING] `[..]` index -[LOCKING] 1 package to latest compatible version [UPDATING] serde v0.0.1+first -> v0.0.1+second ", ) @@ -508,7 +506,6 @@ fn update_precise_build_metadata() { .with_stderr( "\ [UPDATING] `[..]` index -[LOCKING] 1 package to latest compatible version [UPDATING] serde v0.0.1+second -> v0.0.1+first ", ) @@ -546,7 +543,6 @@ fn update_precise_do_not_force_update_deps() { .with_stderr( "\ [UPDATING] `[..]` index -[LOCKING] 1 package to latest compatible version [UPDATING] serde v0.2.1 -> v0.2.2 [NOTE] pass `--verbose` to see 1 unchanged dependencies behind latest ", @@ -702,7 +698,6 @@ fn update_precise_first_run() { .with_stderr( "\ [UPDATING] `[..]` index -[LOCKING] 1 package to latest compatible version [DOWNGRADING] serde v0.2.1 -> v0.2.0 ", ) @@ -857,7 +852,6 @@ fn update_precise_first_run() { .with_stderr( "\ [UPDATING] `[..]` index -[LOCKING] 0 packages to latest compatible versions ", ) .run(); @@ -1024,7 +1018,6 @@ required by package `foo v0.1.0 ([ROOT]/foo)` .with_stderr( "\ [UPDATING] [..] index -[LOCKING] 1 package to latest compatible version [UPDATING] bar v0.1.0+extra-stuff.0 -> v0.1.1+extra-stuff.1 ", ) @@ -1047,7 +1040,6 @@ required by package `foo v0.1.0 ([ROOT]/foo)` .with_stderr( "\ [UPDATING] [..] index -[LOCKING] 1 package to latest compatible version [UPDATING] bar v0.1.1+extra-stuff.1 -> v0.1.3 ", ) @@ -1379,7 +1371,6 @@ fn update_precise_git_revisions() { .with_stderr(format!( "\ [UPDATING] git repository `{url}` -[LOCKING] 1 package to latest compatible version [UPDATING] git v0.5.0 ([..]) -> #{}", &tag_commit_id[..8], )) @@ -1393,7 +1384,6 @@ fn update_precise_git_revisions() { .with_stderr(format!( "\ [UPDATING] git repository `{url}` -[LOCKING] 1 package to latest compatible version [UPDATING] git v0.5.0 ([..]) -> #{short_id}", )) .run(); @@ -1408,7 +1398,6 @@ fn update_precise_git_revisions() { .with_stderr(format!( "\ [UPDATING] git repository `{url}` -[LOCKING] 1 package to latest compatible version [UPDATING] git v0.5.0 ([..]) -> #{}", &tag_commit_id[..8], )) @@ -1427,7 +1416,6 @@ fn update_precise_git_revisions() { .with_stderr(format!( "\ [UPDATING] git repository `{url}` -[LOCKING] 1 package to latest compatible version [UPDATING] git v0.5.0 ([..]) -> #{}", &head_id[..8], )) @@ -1487,7 +1475,6 @@ Caused by: [UPDATING] `dummy-registry` index [WARNING] selected package `bar@0.1.1` was yanked by the author [NOTE] if possible, try a compatible non-yanked version -[LOCKING] 1 package to latest compatible version [UPDATING] bar v0.1.0 -> v0.1.1 ", ) @@ -1531,7 +1518,6 @@ fn precise_yanked_multiple_presence() { [UPDATING] `dummy-registry` index [WARNING] selected package `bar@0.1.1` was yanked by the author [NOTE] if possible, try a compatible non-yanked version -[LOCKING] 1 package to latest compatible version [UPDATING] bar v0.1.0 -> v0.1.1 ", )