From 753b03f652a3c026b883404cfe8a61ce9d767083 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Tue, 16 Apr 2019 09:06:59 -0700 Subject: [PATCH] Alter `cargo package` Cargo.lock modification note. Try to make it clearer that it is not modifying the actual Cargo.lock file, but the one that is being stored in the .crate file. --- src/cargo/ops/cargo_package.rs | 2 +- tests/testsuite/publish_lockfile.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cargo/ops/cargo_package.rs b/src/cargo/ops/cargo_package.rs index 9bac8ab28..d54751536 100644 --- a/src/cargo/ops/cargo_package.rs +++ b/src/cargo/ops/cargo_package.rs @@ -532,7 +532,7 @@ fn compare_resolve( ) } }; - let msg = format!("package `{}` added to Cargo.lock{}", pkg_id, extra); + let msg = format!("package `{}` added to the packaged Cargo.lock file{}", pkg_id, extra); config.shell().status_with_color("Note", msg, Color::Cyan)?; } Ok(()) diff --git a/tests/testsuite/publish_lockfile.rs b/tests/testsuite/publish_lockfile.rs index db49fc33a..ff29d6c7f 100644 --- a/tests/testsuite/publish_lockfile.rs +++ b/tests/testsuite/publish_lockfile.rs @@ -186,8 +186,8 @@ fn note_resolve_changes() { [ARCHIVING] Cargo.toml [ARCHIVING] src/main.rs [UPDATING] `[..]` index -[NOTE] package `mutli v0.1.0` added to Cargo.lock, was originally sourced from `[..]/foo/mutli` -[NOTE] package `patched v1.0.0` added to Cargo.lock, was originally sourced from `[..]/foo/patched` +[NOTE] package `mutli v0.1.0` added to the packaged Cargo.lock file, was originally sourced from `[..]/foo/mutli` +[NOTE] package `patched v1.0.0` added to the packaged Cargo.lock file, was originally sourced from `[..]/foo/patched` ", ) .run(); @@ -310,7 +310,7 @@ fn out_of_date_lock_note() { [ARCHIVING] Cargo.toml [ARCHIVING] src/main.rs [UPDATING] `[..]` index -[NOTE] package `dep v2.0.0` added to Cargo.lock, previous version was `1.0.0` +[NOTE] package `dep v2.0.0` added to the packaged Cargo.lock file, previous version was `1.0.0` ", ) .run();