From 52b100b064ca31bc8a8020934b86184114718204 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Wed, 27 Jul 2022 09:44:02 -0500 Subject: [PATCH] feat(upgrade): Provide table view for upgrades This provides a `cargo outdated`-like UI, reducing the need for one extra tool and helps raise visibility into cargo-upgrades decisions in a pretty way (compared to lines and lines of warnings). Fixes #750 --- src/bin/upgrade/upgrade.rs | 377 +++++++++++------- src/lib.rs | 3 +- src/util.rs | 11 + tests/cargo-upgrade/alt_registry/stderr.log | 6 +- tests/cargo-upgrade/dry_run/stderr.log | 4 +- tests/cargo-upgrade/exclude_dep/stderr.log | 32 +- .../cargo-upgrade/exclude_renamed/stderr.log | 4 +- .../implicit_prerelease/stderr.log | 6 +- tests/cargo-upgrade/locked/stderr.log | 4 +- tests/cargo-upgrade/optional_dep/stderr.log | 4 +- tests/cargo-upgrade/pinned/stderr.log | 20 +- .../preserve_precision_major/stderr.log | 4 +- .../preserve_precision_minor/stderr.log | 4 +- .../preserve_precision_patch/stderr.log | 4 +- .../preserves_inline_table/stderr.log | 4 +- .../preserves_std_table/stderr.log | 4 +- tests/cargo-upgrade/single_dep/stderr.log | 4 +- .../cargo-upgrade/skip_compatible/stderr.log | 6 +- tests/cargo-upgrade/specified/stderr.log | 4 +- tests/cargo-upgrade/to_lockfile/stderr.log | 18 +- tests/cargo-upgrade/to_version/stderr.log | 4 +- tests/cargo-upgrade/upgrade_all/stderr.log | 17 +- .../upgrade_everything/stderr.log | 33 +- .../cargo-upgrade/upgrade_renamed/stderr.log | 6 +- .../upgrade_workspace/stderr.log | 17 +- .../cargo-upgrade/virtual_manifest/stderr.log | 17 +- .../workspace_member_cwd/stderr.log | 4 +- .../workspace_member_manifest_path/stderr.log | 4 +- tests/cmd/upgrade/alt_registry.toml | 6 +- tests/cmd/upgrade/dry_run.toml | 4 +- tests/cmd/upgrade/exclude_dep.toml | 32 +- tests/cmd/upgrade/exclude_renamed.toml | 4 +- tests/cmd/upgrade/implicit_prerelease.toml | 6 +- tests/cmd/upgrade/locked.toml | 4 +- tests/cmd/upgrade/optional_dep.toml | 4 +- tests/cmd/upgrade/pinned.toml | 20 +- .../cmd/upgrade/preserve_precision_major.toml | 4 +- .../cmd/upgrade/preserve_precision_minor.toml | 4 +- .../cmd/upgrade/preserve_precision_patch.toml | 4 +- tests/cmd/upgrade/preserves_inline_table.toml | 4 +- tests/cmd/upgrade/preserves_std_table.toml | 4 +- tests/cmd/upgrade/single_dep.toml | 4 +- tests/cmd/upgrade/skip_compatible.toml | 6 +- tests/cmd/upgrade/specified.toml | 4 +- tests/cmd/upgrade/to_lockfile.toml | 20 +- tests/cmd/upgrade/to_version.toml | 4 +- tests/cmd/upgrade/upgrade_all.toml | 20 +- tests/cmd/upgrade/upgrade_everything.toml | 33 +- tests/cmd/upgrade/upgrade_renamed.toml | 6 +- tests/cmd/upgrade/upgrade_workspace.toml | 20 +- tests/cmd/upgrade/virtual_manifest.toml | 20 +- tests/cmd/upgrade/workspace_member_cwd.toml | 4 +- .../workspace_member_manifest_path.toml | 4 +- 53 files changed, 572 insertions(+), 298 deletions(-) diff --git a/src/bin/upgrade/upgrade.rs b/src/bin/upgrade/upgrade.rs index 8a10aa5ad2..d01f2ddca5 100644 --- a/src/bin/upgrade/upgrade.rs +++ b/src/bin/upgrade/upgrade.rs @@ -4,8 +4,8 @@ use std::path::PathBuf; use cargo_edit::{ colorize_stderr, find, get_latest_dependency, registry_url, resolve_manifests, set_dep_version, - shell_note, shell_status, shell_warn, update_registry_index, CargoResult, Context, CrateSpec, - Dependency, LocalManifest, + shell_note, shell_status, shell_warn, shell_write_stderr, update_registry_index, CargoResult, + Context, CrateSpec, Dependency, LocalManifest, }; use clap::Args; use indexmap::IndexMap; @@ -164,6 +164,7 @@ fn exec(args: UpgradeArgs) -> CargoResult<()> { for package in manifests { let mut manifest = LocalManifest::try_new(package.manifest_path.as_std_path())?; let mut crate_modified = false; + let mut table = Vec::new(); let manifest_path = manifest.path.clone(); shell_status("Checking", &format!("{}'s dependencies", package.name))?; for dep_table in manifest.get_dependency_tables_mut() { @@ -207,155 +208,121 @@ fn exec(args: UpgradeArgs) -> CargoResult<()> { continue; } }; + + let mut reason = None; if !args.pinned { if dependency.rename.is_some() { - args.verbose(|| { - shell_warn(&format!( - "ignoring {}, renamed dependencies are pinned", - dependency.toml_key(), - )) - })?; + reason.get_or_insert("pinned"); pinned_present = true; - continue; } if let Ok(version_req) = VersionReq::parse(&old_version_req) { if version_req.comparators.iter().any(|comparator| { matches!(comparator.op, Op::Exact | Op::Less | Op::LessEq) }) { - args.verbose(|| { - shell_warn(&format!( - "ignoring {}, version ({}) is pinned", - dependency.toml_key(), - old_version_req - )) - })?; + reason.get_or_insert("pinned"); pinned_present = true; - continue; } } } - let new_version_req = if let Some(Some(new_version_req)) = + let locked_version = + find_locked_version(&dependency.name, &old_version_req, &locked); + + let latest_version = if dependency + .source + .as_ref() + .and_then(|s| s.as_registry()) + .is_some() + { + // Update indices for any alternative registries, unless + // we're offline. + let registry_url = dependency + .registry() + .map(|registry| registry_url(&manifest_path, Some(registry))) + .transpose()?; + if !args.offline { + if let Some(registry_url) = ®istry_url { + if updated_registries.insert(registry_url.to_owned()) { + update_registry_index(registry_url, false)?; + } + } + } + let is_prerelease = old_version_req.contains('-'); + let latest_version = get_latest_dependency( + &dependency.name, + is_prerelease, + &manifest_path, + registry_url.as_ref(), + ) + .map(|d| { + d.version() + .expect("registry packages always have a version") + .to_owned() + }); + latest_version.ok() + } else { + None + }; + + let new_version_req = if reason.is_some() { + old_version_req.clone() + } else if let Some(Some(new_version_req)) = selected_dependencies.get(dependency.toml_key()) { new_version_req.to_owned() } else { - // Not checking `selected_dependencies.is_empty`, it was checked earlier let new_version = if args.to_lockfile { - match find_locked_version(&dependency.name, &old_version_req, &locked) { - Some(new_version) => new_version, - None => { - args.verbose(|| { - shell_warn(&format!( - "ignoring {}, could not find package: not in lock file", - dependency.toml_key(), - )) - })?; - continue; - } - } - } else { - if dependency - .source - .as_ref() - .and_then(|s| s.as_registry()) - .is_none() - { - args.verbose(|| { - let source = dependency - .source() - .map(|s| s.to_string()) - .unwrap_or_else(|| "unknown".to_owned()); - shell_warn(&format!( - "ignoring {}, source is {}", - dependency.toml_key(), - source - )) - })?; - continue; - } - // Update indices for any alternative registries, unless - // we're offline. - let registry_url = dependency - .registry() - .map(|registry| registry_url(&manifest_path, Some(registry))) - .transpose()?; - if !args.offline { - if let Some(registry_url) = ®istry_url { - if updated_registries.insert(registry_url.to_owned()) { - update_registry_index(registry_url, false)?; - } - } + if let Some(locked_version) = &locked_version { + Some(locked_version.clone()) + } else { + None } - let is_prerelease = old_version_req.contains('-'); - let new_version = get_latest_dependency( - &dependency.name, - is_prerelease, - &manifest_path, - registry_url.as_ref(), - ) - .map(|d| { - d.version() - .expect("registry packages always have a version") - .to_owned() - }); - let new_version = match new_version { - Ok(new_version) => new_version, - Err(err) => { - args.verbose(|| { - shell_warn(&format!( - "ignoring {}, could not find package: {}", - dependency.toml_key(), - err - )) - })?; - continue; - } - }; - if old_version_compatible(&old_version_req, &new_version) { - args.verbose(|| { - shell_warn(&format!( - "ignoring {}, version ({}) is compatible with {}", - dependency.toml_key(), - old_version_req, - new_version - )) - })?; + } else if let Some(latest_version) = &latest_version { + if old_version_compatible(&old_version_req, latest_version) { + reason.get_or_insert("compatible"); compatible_present = true; - continue; + None + } else { + Some(latest_version.clone()) } - new_version + } else { + None }; - let mut new_version_req = new_version; - let new_ver: semver::Version = new_version_req.parse()?; - match cargo_edit::upgrade_requirement(&old_version_req, &new_ver) { - Ok(Some(version)) => { - new_version_req = version; - } - Err(_) => {} - _ => { - new_version_req = old_version_req.clone(); + if let Some(mut new_version_req) = new_version { + let new_ver: semver::Version = new_version_req.parse()?; + match cargo_edit::upgrade_requirement(&old_version_req, &new_ver) { + Ok(Some(version)) => { + new_version_req = version; + } + Err(_) => {} + _ => { + new_version_req = old_version_req.clone(); + } } + new_version_req + } else { + old_version_req.clone() } - new_version_req }; - if new_version_req == old_version_req { - args.verbose(|| { - shell_warn(&format!( - "ignoring {}, version ({}) is unchanged", - dependency.toml_key(), - new_version_req - )) - })?; - continue; + if new_version_req != old_version_req { + set_dep_version(dep_item, &new_version_req)?; + crate_modified = true; + any_crate_modified = true; } - print_upgrade(dependency.toml_key(), &old_version_req, &new_version_req)?; - set_dep_version(dep_item, &new_version_req)?; - crate_modified = true; - any_crate_modified = true; + table.push(Dep { + name: dependency.toml_key().to_owned(), + old_version_req, + locked_version, + latest_version, + new_version_req, + reason, + }); } } + if !table.is_empty() { + print_upgrade(table)?; + } if !args.dry_run && !args.locked && crate_modified { manifest.write()?; } @@ -458,23 +425,165 @@ fn deprecated_message(message: &str) -> CargoResult<()> { Ok(()) } +struct Dep { + name: String, + old_version_req: String, + locked_version: Option, + latest_version: Option, + new_version_req: String, + reason: Option<&'static str>, +} + +impl Dep { + fn old_version_req_spec(&self) -> ColorSpec { + let mut spec = ColorSpec::new(); + if let Some(latest_version) = self + .latest_version + .as_ref() + .and_then(|v| semver::Version::parse(v).ok()) + { + if let Ok(old_version_req) = semver::VersionReq::parse(&self.old_version_req) { + if !old_version_req.matches(&latest_version) { + spec.set_fg(Some(Color::Yellow)); + } + } + } + spec + } + + fn locked_version(&self) -> &str { + self.locked_version.as_deref().unwrap_or("-") + } + + fn locked_version_spec(&self) -> ColorSpec { + let mut spec = ColorSpec::new(); + if self.locked_version.is_none() { + } else if self.locked_version != self.latest_version { + spec.set_fg(Some(Color::Yellow)); + } + spec + } + + fn latest_version(&self) -> &str { + self.latest_version.as_deref().unwrap_or("-") + } + + fn new_version_req_spec(&self) -> ColorSpec { + let mut spec = ColorSpec::new(); + if self.reason.is_some() { + spec.set_fg(Some(Color::Yellow)); + } else if self.new_version_req != self.old_version_req { + spec.set_fg(Some(Color::Green)); + } + spec + } + + fn reason(&self) -> &str { + self.reason.unwrap_or("") + } + + fn reason_spec(&self) -> ColorSpec { + let mut spec = ColorSpec::new(); + if self.reason.is_some() { + spec.set_fg(Some(Color::Yellow)); + } + spec + } +} + /// Print a message if the new dependency version is different from the old one. -fn print_upgrade(dep_name: &str, old_version: &str, new_version: &str) -> CargoResult<()> { - let old_version = format_version_req(old_version); - let new_version = format_version_req(new_version); +fn print_upgrade(mut deps: Vec) -> CargoResult<()> { + deps.splice( + 0..0, + [ + Dep { + name: "name".to_owned(), + old_version_req: "old req".to_owned(), + locked_version: Some("locked".to_owned()), + latest_version: Some("latest".to_owned()), + new_version_req: "new req".to_owned(), + reason: Some("note"), + }, + Dep { + name: "====".to_owned(), + old_version_req: "=======".to_owned(), + locked_version: Some("======".to_owned()), + latest_version: Some("======".to_owned()), + new_version_req: "=======".to_owned(), + reason: Some("===="), + }, + ], + ); + let mut width = [0; 6]; + for dep in &deps { + width[0] = width[0].max(dep.name.len()); + width[1] = width[1].max(dep.old_version_req.len()); + width[2] = width[2].max(dep.locked_version().len()); + width[3] = width[3].max(dep.latest_version().len()); + width[4] = width[4].max(dep.new_version_req.len()); + width[5] = width[5].max(dep.reason().len()); + } + for (i, dep) in deps.iter().enumerate() { + let is_header = (0..=1).contains(&i); + let mut header_spec = ColorSpec::new(); + header_spec.set_bold(true); + + let spec = if is_header { + header_spec.clone() + } else { + ColorSpec::new() + }; + write_cell(&dep.name, width[0], &spec)?; + shell_write_stderr(" ", &ColorSpec::new())?; + + let spec = if is_header { + header_spec.clone() + } else { + dep.old_version_req_spec() + }; + write_cell(&dep.old_version_req, width[1], &spec)?; + shell_write_stderr(" ", &ColorSpec::new())?; + + let spec = if is_header { + header_spec.clone() + } else { + dep.locked_version_spec() + }; + write_cell(dep.locked_version(), width[2], &spec)?; + shell_write_stderr(" ", &ColorSpec::new())?; + + let spec = if is_header { + header_spec.clone() + } else { + ColorSpec::new() + }; + write_cell(&dep.latest_version(), width[3], &spec)?; + shell_write_stderr(" ", &ColorSpec::new())?; + + let spec = if is_header { + header_spec.clone() + } else { + dep.new_version_req_spec() + }; + write_cell(&dep.new_version_req, width[4], &spec)?; + shell_write_stderr(" ", &ColorSpec::new())?; - shell_status( - "Upgrading", - &format!("{dep_name}: {old_version} -> {new_version}"), - )?; + let spec = if is_header { + header_spec.clone() + } else { + dep.reason_spec() + }; + write_cell(&dep.reason(), width[5], &spec)?; + shell_write_stderr("\n", &ColorSpec::new())?; + } Ok(()) } -fn format_version_req(version: &str) -> String { - if version.chars().next().unwrap_or('0').is_ascii_digit() { - format!("v{}", version) - } else { - version.to_owned() +fn write_cell(content: &str, width: usize, spec: &ColorSpec) -> CargoResult<()> { + shell_write_stderr(content, spec)?; + for _ in 0..(width - content.len()) { + shell_write_stderr(" ", &ColorSpec::new())?; } + Ok(()) } diff --git a/src/lib.rs b/src/lib.rs index 3f4a1bfbd7..64de968410 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -37,6 +37,7 @@ pub use manifest::{find, get_dep_version, set_dep_version, LocalManifest, Manife pub use metadata::{manifest_from_pkgid, resolve_manifests, workspace_members}; pub use registry::registry_url; pub use util::{ - colorize_stderr, shell_note, shell_print, shell_status, shell_warn, Color, ColorChoice, + colorize_stderr, shell_note, shell_print, shell_status, shell_warn, shell_write_stderr, Color, + ColorChoice, }; pub use version::{upgrade_requirement, VersionExt}; diff --git a/src/util.rs b/src/util.rs index 70aab0c06e..9e15d07b3d 100644 --- a/src/util.rs +++ b/src/util.rs @@ -48,3 +48,14 @@ pub fn shell_warn(message: &str) -> CargoResult<()> { pub fn shell_note(message: &str) -> CargoResult<()> { shell_print("note", message, Color::Cyan, false) } + +/// Print a part of a line with formatting +pub fn shell_write_stderr(fragment: impl std::fmt::Display, spec: &ColorSpec) -> CargoResult<()> { + let color_choice = colorize_stderr(); + let mut output = StandardStream::stderr(color_choice); + + output.set_color(spec)?; + write!(output, "{}", fragment)?; + output.reset()?; + Ok(()) +} diff --git a/tests/cargo-upgrade/alt_registry/stderr.log b/tests/cargo-upgrade/alt_registry/stderr.log index 05e3e87e8e..d91fb7a666 100644 --- a/tests/cargo-upgrade/alt_registry/stderr.log +++ b/tests/cargo-upgrade/alt_registry/stderr.log @@ -1,5 +1,7 @@ Updating '[ROOTURL]/registry' index Checking none's dependencies Updating '[ROOTURL]/alternative-registry' index - Upgrading my-package1: v0.1.1 -> v99999.0.0 - Upgrading my-package2: v0.2 -> v99999.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package1 0.1.1 - 99999.0.0 99999.0.0 +my-package2 0.2 - 99999.0.0 99999.0 diff --git a/tests/cargo-upgrade/dry_run/stderr.log b/tests/cargo-upgrade/dry_run/stderr.log index 1310ad1697..356998708e 100644 --- a/tests/cargo-upgrade/dry_run/stderr.log +++ b/tests/cargo-upgrade/dry_run/stderr.log @@ -1,4 +1,6 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies - Upgrading my-package: v0.1.1 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.1.1 - 99999.0.0 99999.0.0 warning: aborting upgrade due to dry run diff --git a/tests/cargo-upgrade/exclude_dep/stderr.log b/tests/cargo-upgrade/exclude_dep/stderr.log index dcd76d7d38..a0cc770034 100644 --- a/tests/cargo-upgrade/exclude_dep/stderr.log +++ b/tests/cargo-upgrade/exclude_dep/stderr.log @@ -1,18 +1,20 @@ Updating '[ROOTURL]/registry' index Checking None's dependencies warning: ignoring docopt, excluded by user - Upgrading pad: v0.1 -> v99999.0 - Upgrading serde_json: v1.0 -> v99999.0 - Upgrading syn: v0.11.10 -> v99999.0.0 - Upgrading tar: v0.4 -> v99999.0 - Upgrading ftp: v2.2.1 -> v99999.0.0 - Upgrading te: v0.1.5 -> v99999.0.0 - Upgrading semver: v0.7 -> v99999.0 - Upgrading rn: v0.1 -> v99999.0 - Upgrading assert_cli: v0.2.0 -> v99999.0.0 - Upgrading tempdir: v0.3 -> v99999.0 -warning: ignoring serde, source is https://github.com/serde-rs/serde.git - Upgrading openssl: v0.9 -> v99999.0 - Upgrading rget: v0.3.0 -> v99999.0.0 - Upgrading geo: v0.7.0 -> v99999.0.0 - Upgrading ftp: v2.2.1 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +pad 0.1 - 99999.0.0 99999.0 +serde_json 1.0 - 99999.0.0 99999.0 +syn 0.11.10 - 99999.0.0 99999.0.0 +tar 0.4 - 99999.0.0 99999.0 +ftp 2.2.1 - 99999.0.0 99999.0.0 +te 0.1.5 - 99999.0.0 99999.0.0 +semver 0.7 - 99999.0.0 99999.0 +rn 0.1 - 99999.0.0 99999.0 +assert_cli 0.2.0 - 99999.0.0 99999.0.0 +tempdir 0.3 - 99999.0.0 99999.0 +serde 1.0 - - 1.0 +openssl 0.9 - 99999.0.0 99999.0 +rget 0.3.0 - 99999.0.0 99999.0.0 +geo 0.7.0 - 99999.0.0 99999.0.0 +ftp 2.2.1 - 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/exclude_renamed/stderr.log b/tests/cargo-upgrade/exclude_renamed/stderr.log index 9940ec71b4..b124fa376e 100644 --- a/tests/cargo-upgrade/exclude_renamed/stderr.log +++ b/tests/cargo-upgrade/exclude_renamed/stderr.log @@ -1,5 +1,7 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies -warning: ignoring te, renamed dependencies are pinned warning: ignoring rx, excluded by user +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +te 0.1.5 - 99999.0.0 0.1.5 pinned note: Re-run with `--pinned` to upgrade pinned version requirements diff --git a/tests/cargo-upgrade/implicit_prerelease/stderr.log b/tests/cargo-upgrade/implicit_prerelease/stderr.log index 4514653460..271832b177 100644 --- a/tests/cargo-upgrade/implicit_prerelease/stderr.log +++ b/tests/cargo-upgrade/implicit_prerelease/stderr.log @@ -1,4 +1,6 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies - Upgrading unrelated-crate: v1.0 -> v99999.0 - Upgrading my-package: v0.1.1-alpha.1 -> v99999.1.0-alpha.1 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +unrelated-crate 1.0 - 99999.0.0 99999.0 +my-package 0.1.1-alpha.1 - 99999.1.0-alpha.1 99999.1.0-alpha.1 diff --git a/tests/cargo-upgrade/locked/stderr.log b/tests/cargo-upgrade/locked/stderr.log index f481495d3f..be89025ba0 100644 --- a/tests/cargo-upgrade/locked/stderr.log +++ b/tests/cargo-upgrade/locked/stderr.log @@ -1,4 +1,6 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies - Upgrading my-package: v0.1.1 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.1.1 - 99999.0.0 99999.0.0 Error: cannot upgrade due to `--locked` diff --git a/tests/cargo-upgrade/optional_dep/stderr.log b/tests/cargo-upgrade/optional_dep/stderr.log index 74c5b6f685..5b4fa9e421 100644 --- a/tests/cargo-upgrade/optional_dep/stderr.log +++ b/tests/cargo-upgrade/optional_dep/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies - Upgrading my-package: v0.1.1 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.1.1 - 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/pinned/stderr.log b/tests/cargo-upgrade/pinned/stderr.log index 11f6180339..d6ecc10953 100644 --- a/tests/cargo-upgrade/pinned/stderr.log +++ b/tests/cargo-upgrade/pinned/stderr.log @@ -1,13 +1,15 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies - Upgrading default: v1.0 -> v99999.0 -warning: ignoring exact, version (=2.0) is pinned -warning: ignoring lessthan, version (<0.4) is pinned -warning: ignoring lessorequal, version (<=3.0) is pinned - Upgrading caret: ^3.0 -> ^99999.0 - Upgrading tilde: ~4.1.0 -> ~99999.0.0 -warning: ignoring greaterthan, version (>2.0) is compatible with 99999.0.0 -warning: ignoring greaterorequal, version (>=2.1.0) is compatible with 99999.0.0 - Upgrading wildcard: v3.* -> v99999.* +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +default 1.0 - 99999.0.0 99999.0 +exact =2.0 - 99999.0.0 =2.0 pinned +lessthan <0.4 - 99999.0.0 <0.4 pinned +lessorequal <=3.0 - 99999.0.0 <=3.0 pinned +caret ^3.0 - 99999.0.0 ^99999.0 +tilde ~4.1.0 - 99999.0.0 ~99999.0.0 +greaterthan >2.0 - 99999.0.0 >2.0 compatible +greaterorequal >=2.1.0 - 99999.0.0 >=2.1.0 compatible +wildcard 3.* - 99999.0.0 99999.* note: Re-run with `--pinned` to upgrade pinned version requirements note: Re-run with `--to-lockfile` to upgrade compatible version requirements diff --git a/tests/cargo-upgrade/preserve_precision_major/stderr.log b/tests/cargo-upgrade/preserve_precision_major/stderr.log index 4e4c4f0221..2634a682dc 100644 --- a/tests/cargo-upgrade/preserve_precision_major/stderr.log +++ b/tests/cargo-upgrade/preserve_precision_major/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies - Upgrading my-package: v0 -> v99999 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0 - 99999.0.0 99999 diff --git a/tests/cargo-upgrade/preserve_precision_minor/stderr.log b/tests/cargo-upgrade/preserve_precision_minor/stderr.log index 0c0253bb0a..f7b4a70ddc 100644 --- a/tests/cargo-upgrade/preserve_precision_minor/stderr.log +++ b/tests/cargo-upgrade/preserve_precision_minor/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies - Upgrading my-package: v0.1 -> v99999.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.1 - 99999.0.0 99999.0 diff --git a/tests/cargo-upgrade/preserve_precision_patch/stderr.log b/tests/cargo-upgrade/preserve_precision_patch/stderr.log index 74c5b6f685..5b4fa9e421 100644 --- a/tests/cargo-upgrade/preserve_precision_patch/stderr.log +++ b/tests/cargo-upgrade/preserve_precision_patch/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies - Upgrading my-package: v0.1.1 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.1.1 - 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/preserves_inline_table/stderr.log b/tests/cargo-upgrade/preserves_inline_table/stderr.log index 74c5b6f685..5b4fa9e421 100644 --- a/tests/cargo-upgrade/preserves_inline_table/stderr.log +++ b/tests/cargo-upgrade/preserves_inline_table/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies - Upgrading my-package: v0.1.1 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.1.1 - 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/preserves_std_table/stderr.log b/tests/cargo-upgrade/preserves_std_table/stderr.log index 74c5b6f685..5b4fa9e421 100644 --- a/tests/cargo-upgrade/preserves_std_table/stderr.log +++ b/tests/cargo-upgrade/preserves_std_table/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies - Upgrading my-package: v0.1.1 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.1.1 - 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/single_dep/stderr.log b/tests/cargo-upgrade/single_dep/stderr.log index 74c5b6f685..5b4fa9e421 100644 --- a/tests/cargo-upgrade/single_dep/stderr.log +++ b/tests/cargo-upgrade/single_dep/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies - Upgrading my-package: v0.1.1 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.1.1 - 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/skip_compatible/stderr.log b/tests/cargo-upgrade/skip_compatible/stderr.log index d876305b05..34cf704bc9 100644 --- a/tests/cargo-upgrade/skip_compatible/stderr.log +++ b/tests/cargo-upgrade/skip_compatible/stderr.log @@ -1,5 +1,7 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies - Upgrading test_breaking: v0.1 -> v0.2 -warning: ignoring test_nonbreaking, version (0.1) is compatible with 0.1.1 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +test_breaking 0.1 - 0.2.0 0.2 +test_nonbreaking 0.1 - 0.1.1 0.1 compatible note: Re-run with `--to-lockfile` to upgrade compatible version requirements diff --git a/tests/cargo-upgrade/specified/stderr.log b/tests/cargo-upgrade/specified/stderr.log index b6b1747126..448508a068 100644 --- a/tests/cargo-upgrade/specified/stderr.log +++ b/tests/cargo-upgrade/specified/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies - Upgrading my-package1: v0.1 -> v99999.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package1 0.1 - 99999.0.0 99999.0 diff --git a/tests/cargo-upgrade/to_lockfile/stderr.log b/tests/cargo-upgrade/to_lockfile/stderr.log index cd92ac3325..6fe382befc 100644 --- a/tests/cargo-upgrade/to_lockfile/stderr.log +++ b/tests/cargo-upgrade/to_lockfile/stderr.log @@ -1,9 +1,17 @@ Checking one's dependencies - Upgrading my-package: v0.2.0 -> v0.2.3 - Upgrading three: v0.1.0 -> v0.1.5 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.2.0 0.2.3+my-package 99999.0.0 0.2.3 +three 0.1.0 0.1.5 - 0.1.5 Checking three's dependencies - Upgrading my-package: v0.2.0 -> v0.2.3 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.2.0 0.2.3+my-package 99999.0.0 0.2.3 Checking two's dependencies - Upgrading my-package: v0.2.0 -> v0.2.3 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.2.0 0.2.3+my-package 99999.0.0 0.2.3 Checking four's dependencies - Upgrading my-package: v0.2.0 -> v0.2.3 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.2.0 0.2.3+my-package 99999.0.0 0.2.3 diff --git a/tests/cargo-upgrade/to_version/stderr.log b/tests/cargo-upgrade/to_version/stderr.log index c70fa7c476..456c071873 100644 --- a/tests/cargo-upgrade/to_version/stderr.log +++ b/tests/cargo-upgrade/to_version/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies - Upgrading docopt: v0.8.0 -> v1000000.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +docopt 0.8.0 - 99999.0.0 1000000.0.0 diff --git a/tests/cargo-upgrade/upgrade_all/stderr.log b/tests/cargo-upgrade/upgrade_all/stderr.log index 5e69b98ea1..8841876f4c 100644 --- a/tests/cargo-upgrade/upgrade_all/stderr.log +++ b/tests/cargo-upgrade/upgrade_all/stderr.log @@ -1,10 +1,19 @@ The flag `--all` has been deprecated in favor of `--workspace` Updating '[ROOTURL]/registry' index Checking one's dependencies - Upgrading my-package: v0.2.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.2.0 - 99999.0.0 99999.0.0 +three 0.1.0 - - 0.1.0 Checking three's dependencies - Upgrading my-package: v0.2.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.2.0 - 99999.0.0 99999.0.0 Checking two's dependencies - Upgrading my-package: v0.2.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.2.0 - 99999.0.0 99999.0.0 Checking four's dependencies - Upgrading my-package: v0.2.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.2.0 - 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/upgrade_everything/stderr.log b/tests/cargo-upgrade/upgrade_everything/stderr.log index 5c00d837d8..daf9a91977 100644 --- a/tests/cargo-upgrade/upgrade_everything/stderr.log +++ b/tests/cargo-upgrade/upgrade_everything/stderr.log @@ -1,17 +1,20 @@ Updating '[ROOTURL]/registry' index Checking None's dependencies - Upgrading docopt: v0.8 -> v99999.0 - Upgrading pad: v0.1 -> v99999.0 - Upgrading serde_json: v1.0 -> v99999.0 - Upgrading syn: v0.11.10 -> v99999.0.0 - Upgrading tar: v0.4 -> v99999.0 - Upgrading ftp: v2.2.1 -> v99999.0.0 - Upgrading te: v0.1.5 -> v99999.0.0 - Upgrading semver: v0.7 -> v99999.0 - Upgrading rn: v0.1 -> v99999.0 - Upgrading assert_cli: v0.2.0 -> v99999.0.0 - Upgrading tempdir: v0.3 -> v99999.0 - Upgrading openssl: v0.9 -> v99999.0 - Upgrading rget: v0.3.0 -> v99999.0.0 - Upgrading geo: v0.7.0 -> v99999.0.0 - Upgrading ftp: v2.2.1 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +docopt 0.8 - 99999.0.0 99999.0 +pad 0.1 - 99999.0.0 99999.0 +serde_json 1.0 - 99999.0.0 99999.0 +syn 0.11.10 - 99999.0.0 99999.0.0 +tar 0.4 - 99999.0.0 99999.0 +ftp 2.2.1 - 99999.0.0 99999.0.0 +te 0.1.5 - 99999.0.0 99999.0.0 +semver 0.7 - 99999.0.0 99999.0 +rn 0.1 - 99999.0.0 99999.0 +assert_cli 0.2.0 - 99999.0.0 99999.0.0 +tempdir 0.3 - 99999.0.0 99999.0 +serde 1.0 - - 1.0 +openssl 0.9 - 99999.0.0 99999.0 +rget 0.3.0 - 99999.0.0 99999.0.0 +geo 0.7.0 - 99999.0.0 99999.0.0 +ftp 2.2.1 - 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/upgrade_renamed/stderr.log b/tests/cargo-upgrade/upgrade_renamed/stderr.log index 63d86a46fa..07e25531a5 100644 --- a/tests/cargo-upgrade/upgrade_renamed/stderr.log +++ b/tests/cargo-upgrade/upgrade_renamed/stderr.log @@ -1,4 +1,6 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies - Upgrading m1: v0.1.1 -> v99999.0.0 - Upgrading m2: v0.2 -> v99999.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +m1 0.1.1 - 99999.0.0 99999.0.0 +m2 0.2 - 99999.0.0 99999.0 diff --git a/tests/cargo-upgrade/upgrade_workspace/stderr.log b/tests/cargo-upgrade/upgrade_workspace/stderr.log index 2d14b0b4de..d76054c632 100644 --- a/tests/cargo-upgrade/upgrade_workspace/stderr.log +++ b/tests/cargo-upgrade/upgrade_workspace/stderr.log @@ -1,9 +1,18 @@ Updating '[ROOTURL]/registry' index Checking one's dependencies - Upgrading my-package: v0.2.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.2.0 - 99999.0.0 99999.0.0 +three 0.1.0 - - 0.1.0 Checking three's dependencies - Upgrading my-package: v0.2.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.2.0 - 99999.0.0 99999.0.0 Checking two's dependencies - Upgrading my-package: v0.2.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.2.0 - 99999.0.0 99999.0.0 Checking four's dependencies - Upgrading my-package: v0.2.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.2.0 - 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/virtual_manifest/stderr.log b/tests/cargo-upgrade/virtual_manifest/stderr.log index 2d14b0b4de..d76054c632 100644 --- a/tests/cargo-upgrade/virtual_manifest/stderr.log +++ b/tests/cargo-upgrade/virtual_manifest/stderr.log @@ -1,9 +1,18 @@ Updating '[ROOTURL]/registry' index Checking one's dependencies - Upgrading my-package: v0.2.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.2.0 - 99999.0.0 99999.0.0 +three 0.1.0 - - 0.1.0 Checking three's dependencies - Upgrading my-package: v0.2.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.2.0 - 99999.0.0 99999.0.0 Checking two's dependencies - Upgrading my-package: v0.2.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.2.0 - 99999.0.0 99999.0.0 Checking four's dependencies - Upgrading my-package: v0.2.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.2.0 - 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/workspace_member_cwd/stderr.log b/tests/cargo-upgrade/workspace_member_cwd/stderr.log index a6ca9ef75f..57a9ef8d10 100644 --- a/tests/cargo-upgrade/workspace_member_cwd/stderr.log +++ b/tests/cargo-upgrade/workspace_member_cwd/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking one's dependencies - Upgrading my-package: v0.1.1 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.1.1 - 99999.0.0 99999.0.0 diff --git a/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log b/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log index 241801fb91..f57c6d080d 100644 --- a/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log +++ b/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking one's dependencies - Upgrading my-package: v0.2.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +my-package 0.2.0 - 99999.0.0 99999.0.0 diff --git a/tests/cmd/upgrade/alt_registry.toml b/tests/cmd/upgrade/alt_registry.toml index 94630079ce..7fd9ee6497 100644 --- a/tests/cmd/upgrade/alt_registry.toml +++ b/tests/cmd/upgrade/alt_registry.toml @@ -4,8 +4,10 @@ status = "success" stdout = "" stderr = """ Checking none's dependencies - Upgrading toml_edit: v0.1.5 -> v99999.0.0 - Upgrading regex: v0.2 -> v99999.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +toml_edit 0.1.5 - 99999.0.0 99999.0.0 +regex 0.2 - 99999.0.0 99999.0 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/dry_run.toml b/tests/cmd/upgrade/dry_run.toml index eab8826400..94d8c18c53 100644 --- a/tests/cmd/upgrade/dry_run.toml +++ b/tests/cmd/upgrade/dry_run.toml @@ -4,7 +4,9 @@ status = "success" stdout = "" stderr = """ Checking cargo-list-test-fixture's dependencies - Upgrading docopt: v0.8.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +docopt 0.8.0 - 99999.0.0 99999.0.0 warning: aborting upgrade due to dry run """ fs.sandbox = true diff --git a/tests/cmd/upgrade/exclude_dep.toml b/tests/cmd/upgrade/exclude_dep.toml index a73a12ed99..29c581a0be 100644 --- a/tests/cmd/upgrade/exclude_dep.toml +++ b/tests/cmd/upgrade/exclude_dep.toml @@ -5,21 +5,23 @@ stdout = "" stderr = """ Checking None's dependencies warning: ignoring docopt, excluded by user - Upgrading pad: v0.1 -> v99999.0 - Upgrading serde_json: v1.0 -> v99999.0 - Upgrading syn: v0.11.10 -> v99999.0.0 - Upgrading tar: v0.4 -> v99999.0 - Upgrading ftp: v2.2.1 -> v99999.0.0 - Upgrading te: v0.1.5 -> v99999.0.0 - Upgrading semver: v0.7 -> v99999.0 - Upgrading rn: v0.1 -> v99999.0 - Upgrading assert_cli: v0.2.0 -> v99999.0.0 - Upgrading tempdir: v0.3 -> v99999.0 -warning: ignoring serde, source is https://github.com/serde-rs/serde.git - Upgrading openssl: v0.9 -> v99999.0 - Upgrading rget: v0.3.0 -> v99999.0.0 - Upgrading geo: v0.7.0 -> v99999.0.0 - Upgrading ftp: v2.2.1 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +pad 0.1 - 99999.0.0 99999.0 +serde_json 1.0 - 99999.0.0 99999.0 +syn 0.11.10 - 99999.0.0 99999.0.0 +tar 0.4 - 99999.0.0 99999.0 +ftp 2.2.1 - 99999.0.0 99999.0.0 +te 0.1.5 - 99999.0.0 99999.0.0 +semver 0.7 - 99999.0.0 99999.0 +rn 0.1 - 99999.0.0 99999.0 +assert_cli 0.2.0 - 99999.0.0 99999.0.0 +tempdir 0.3 - 99999.0.0 99999.0 +serde 1.0 - - 1.0 +openssl 0.9 - 99999.0.0 99999.0 +rget 0.3.0 - 99999.0.0 99999.0.0 +geo 0.7.0 - 99999.0.0 99999.0.0 +ftp 2.2.1 - 99999.0.0 99999.0.0 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/exclude_renamed.toml b/tests/cmd/upgrade/exclude_renamed.toml index 5f005e22f4..5926020d24 100644 --- a/tests/cmd/upgrade/exclude_renamed.toml +++ b/tests/cmd/upgrade/exclude_renamed.toml @@ -4,8 +4,10 @@ status = "success" stdout = "" stderr = """ Checking cargo-list-test-fixture's dependencies -warning: ignoring te, renamed dependencies are pinned warning: ignoring rx, excluded by user +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +te 0.1.5 - 99999.0.0 0.1.5 pinned note: Re-run with `--pinned` to upgrade pinned version requirements """ fs.sandbox = true diff --git a/tests/cmd/upgrade/implicit_prerelease.toml b/tests/cmd/upgrade/implicit_prerelease.toml index 9aebb7140b..6424eed1e3 100644 --- a/tests/cmd/upgrade/implicit_prerelease.toml +++ b/tests/cmd/upgrade/implicit_prerelease.toml @@ -4,8 +4,10 @@ status = "success" stdout = "" stderr = """ Checking cargo-list-test-fixture's dependencies - Upgrading a: v1.0 -> v99999.0 - Upgrading b: v0.8.0-alpha -> v99999.0.0-alpha.1 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +a 1.0 - 99999.0.0 99999.0 +b 0.8.0-alpha - 99999.0.0-alpha.1 99999.0.0-alpha.1 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/locked.toml b/tests/cmd/upgrade/locked.toml index 79ab02a631..4c2a34ad5c 100644 --- a/tests/cmd/upgrade/locked.toml +++ b/tests/cmd/upgrade/locked.toml @@ -4,7 +4,9 @@ status = "failed" stdout = "" stderr = """ Checking cargo-list-test-fixture's dependencies - Upgrading docopt: v0.8.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +docopt 0.8.0 - 99999.0.0 99999.0.0 Error: cannot upgrade due to `--locked` """ fs.sandbox = true diff --git a/tests/cmd/upgrade/optional_dep.toml b/tests/cmd/upgrade/optional_dep.toml index 001761e13f..81ce622886 100644 --- a/tests/cmd/upgrade/optional_dep.toml +++ b/tests/cmd/upgrade/optional_dep.toml @@ -4,7 +4,9 @@ status = "success" stdout = "" stderr = """ Checking cargo-list-test-fixture's dependencies - Upgrading docopt: v0.8.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +docopt 0.8.0 - 99999.0.0 99999.0.0 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/pinned.toml b/tests/cmd/upgrade/pinned.toml index 89012dd9d5..d08343d663 100644 --- a/tests/cmd/upgrade/pinned.toml +++ b/tests/cmd/upgrade/pinned.toml @@ -4,15 +4,17 @@ status = "success" stdout = "" stderr = """ Checking cargo-list-test-fixture's dependencies - Upgrading default: v1.0 -> v99999.0 -warning: ignoring exact, version (=2.0) is pinned -warning: ignoring lessthan, version (<0.4) is pinned -warning: ignoring lessorequal, version (<=3.0) is pinned - Upgrading caret: ^3.0 -> ^99999.0 - Upgrading tilde: ~4.1.0 -> ~99999.0.0 -warning: ignoring greaterthan, version (>2.0) is compatible with 99999.0.0 -warning: ignoring greaterorequal, version (>=2.1.0) is compatible with 99999.0.0 - Upgrading wildcard: v3.* -> v99999.* +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +default 1.0 - 99999.0.0 99999.0 +exact =2.0 - 99999.0.0 =2.0 pinned +lessthan <0.4 - 99999.0.0 <0.4 pinned +lessorequal <=3.0 - 99999.0.0 <=3.0 pinned +caret ^3.0 - 99999.0.0 ^99999.0 +tilde ~4.1.0 - 99999.0.0 ~99999.0.0 +greaterthan >2.0 - 99999.0.0 >2.0 compatible +greaterorequal >=2.1.0 - 99999.0.0 >=2.1.0 compatible +wildcard 3.* - 99999.0.0 99999.* note: Re-run with `--pinned` to upgrade pinned version requirements note: Re-run with `--to-lockfile` to upgrade compatible version requirements """ diff --git a/tests/cmd/upgrade/preserve_precision_major.toml b/tests/cmd/upgrade/preserve_precision_major.toml index f690f98626..32d1bf4bf6 100644 --- a/tests/cmd/upgrade/preserve_precision_major.toml +++ b/tests/cmd/upgrade/preserve_precision_major.toml @@ -4,7 +4,9 @@ status = "success" stdout = "" stderr = """ Checking cargo-list-test-fixture's dependencies - Upgrading docopt: v0 -> v99999 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +docopt 0 - 99999.0.0 99999 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/preserve_precision_minor.toml b/tests/cmd/upgrade/preserve_precision_minor.toml index 880255014b..b8b2b046d2 100644 --- a/tests/cmd/upgrade/preserve_precision_minor.toml +++ b/tests/cmd/upgrade/preserve_precision_minor.toml @@ -4,7 +4,9 @@ status = "success" stdout = "" stderr = """ Checking cargo-list-test-fixture's dependencies - Upgrading docopt: v0.8 -> v99999.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +docopt 0.8 - 99999.0.0 99999.0 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/preserve_precision_patch.toml b/tests/cmd/upgrade/preserve_precision_patch.toml index aee35058d8..069c3ea880 100644 --- a/tests/cmd/upgrade/preserve_precision_patch.toml +++ b/tests/cmd/upgrade/preserve_precision_patch.toml @@ -4,7 +4,9 @@ status = "success" stdout = "" stderr = """ Checking cargo-list-test-fixture's dependencies - Upgrading docopt: v0.8.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +docopt 0.8.0 - 99999.0.0 99999.0.0 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/preserves_inline_table.toml b/tests/cmd/upgrade/preserves_inline_table.toml index 001761e13f..81ce622886 100644 --- a/tests/cmd/upgrade/preserves_inline_table.toml +++ b/tests/cmd/upgrade/preserves_inline_table.toml @@ -4,7 +4,9 @@ status = "success" stdout = "" stderr = """ Checking cargo-list-test-fixture's dependencies - Upgrading docopt: v0.8.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +docopt 0.8.0 - 99999.0.0 99999.0.0 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/preserves_std_table.toml b/tests/cmd/upgrade/preserves_std_table.toml index 001761e13f..81ce622886 100644 --- a/tests/cmd/upgrade/preserves_std_table.toml +++ b/tests/cmd/upgrade/preserves_std_table.toml @@ -4,7 +4,9 @@ status = "success" stdout = "" stderr = """ Checking cargo-list-test-fixture's dependencies - Upgrading docopt: v0.8.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +docopt 0.8.0 - 99999.0.0 99999.0.0 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/single_dep.toml b/tests/cmd/upgrade/single_dep.toml index 001761e13f..81ce622886 100644 --- a/tests/cmd/upgrade/single_dep.toml +++ b/tests/cmd/upgrade/single_dep.toml @@ -4,7 +4,9 @@ status = "success" stdout = "" stderr = """ Checking cargo-list-test-fixture's dependencies - Upgrading docopt: v0.8.0 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +docopt 0.8.0 - 99999.0.0 99999.0.0 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/skip_compatible.toml b/tests/cmd/upgrade/skip_compatible.toml index d9ffb778e7..dde5241b75 100644 --- a/tests/cmd/upgrade/skip_compatible.toml +++ b/tests/cmd/upgrade/skip_compatible.toml @@ -4,8 +4,10 @@ status = "success" stdout = "" stderr = """ Checking cargo-list-test-fixture's dependencies - Upgrading test_breaking: v0.1 -> v0.2 -warning: ignoring test_nonbreaking, version (0.1) is compatible with 0.1.1 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +test_breaking 0.1 - 0.2.0 0.2 +test_nonbreaking 0.1 - 0.1.1 0.1 compatible note: Re-run with `--to-lockfile` to upgrade compatible version requirements """ fs.sandbox = true diff --git a/tests/cmd/upgrade/specified.toml b/tests/cmd/upgrade/specified.toml index 1eb9dca9ef..edf98e9537 100644 --- a/tests/cmd/upgrade/specified.toml +++ b/tests/cmd/upgrade/specified.toml @@ -4,7 +4,9 @@ status = "success" stdout = "" stderr = """ Checking cargo-list-test-fixture's dependencies - Upgrading a: v1.0 -> v99999.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +a 1.0 - 99999.0.0 99999.0 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/to_lockfile.toml b/tests/cmd/upgrade/to_lockfile.toml index 22541ba01a..07d0093b3e 100644 --- a/tests/cmd/upgrade/to_lockfile.toml +++ b/tests/cmd/upgrade/to_lockfile.toml @@ -4,16 +4,24 @@ status = "success" stdout = "" stderr = """ Checking one's dependencies - Upgrading libc: v0.2.28 -> v0.2.62 -warning: ignoring rand, version (0.3) is unchanged warning: ignoring three, source is [CWD]/one/Cargo.toml/../implicit/three +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 0.2.62 99999.0.0 0.2.62 +rand 0.3 0.3.23 99999.0.0 0.3 Checking three's dependencies - Upgrading libc: v0.2.28 -> v0.2.62 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 0.2.62 99999.0.0 0.2.62 Checking two's dependencies - Upgrading libc: v0.2.28 -> v0.2.62 -warning: ignoring rand, version (0.2) is unchanged +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 0.2.62 99999.0.0 0.2.62 +rand 0.2 0.2.1 99999.0.0 0.2 Checking four's dependencies - Upgrading libc: v0.2.28 -> v0.2.62 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 0.2.62 99999.0.0 0.2.62 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/to_version.toml b/tests/cmd/upgrade/to_version.toml index 1cf22ec61f..fe1f8994b4 100644 --- a/tests/cmd/upgrade/to_version.toml +++ b/tests/cmd/upgrade/to_version.toml @@ -4,7 +4,9 @@ status = "success" stdout = "" stderr = """ Checking cargo-list-test-fixture's dependencies - Upgrading docopt: v0.8.0 -> v1000000.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +docopt 0.8.0 - 99999.0.0 1000000.0.0 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/upgrade_all.toml b/tests/cmd/upgrade/upgrade_all.toml index dab5be0259..b4d2c18ccb 100644 --- a/tests/cmd/upgrade/upgrade_all.toml +++ b/tests/cmd/upgrade/upgrade_all.toml @@ -5,15 +5,23 @@ stdout = "" stderr = """ The flag `--all` has been deprecated in favor of `--workspace` Checking one's dependencies - Upgrading libc: v0.2.28 -> v99999.0.0 - Upgrading rand: v0.3 -> v99999.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 - 99999.0.0 99999.0.0 +rand 0.3 - 99999.0.0 99999.0 Checking three's dependencies - Upgrading libc: v0.2.28 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 - 99999.0.0 99999.0.0 Checking two's dependencies - Upgrading libc: v0.2.28 -> v99999.0.0 - Upgrading rand: v0.2 -> v99999.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 - 99999.0.0 99999.0.0 +rand 0.2 - 99999.0.0 99999.0 Checking four's dependencies - Upgrading libc: v0.2.28 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 - 99999.0.0 99999.0.0 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/upgrade_everything.toml b/tests/cmd/upgrade/upgrade_everything.toml index 2dc65dad4c..49a30324d2 100644 --- a/tests/cmd/upgrade/upgrade_everything.toml +++ b/tests/cmd/upgrade/upgrade_everything.toml @@ -4,21 +4,24 @@ status = "success" stdout = "" stderr = """ Checking None's dependencies - Upgrading docopt: v0.8 -> v99999.0 - Upgrading pad: v0.1 -> v99999.0 - Upgrading serde_json: v1.0 -> v99999.0 - Upgrading syn: v0.11.10 -> v99999.0.0 - Upgrading tar: v0.4 -> v99999.0 - Upgrading ftp: v2.2.1 -> v99999.0.0 - Upgrading te: v0.1.5 -> v99999.0.0 - Upgrading semver: v0.7 -> v99999.0 - Upgrading rn: v0.1 -> v99999.0 - Upgrading assert_cli: v0.2.0 -> v99999.0.0 - Upgrading tempdir: v0.3 -> v99999.0 - Upgrading openssl: v0.9 -> v99999.0 - Upgrading rget: v0.3.0 -> v99999.0.0 - Upgrading geo: v0.7.0 -> v99999.0.0 - Upgrading ftp: v2.2.1 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +docopt 0.8 - 99999.0.0 99999.0 +pad 0.1 - 99999.0.0 99999.0 +serde_json 1.0 - 99999.0.0 99999.0 +syn 0.11.10 - 99999.0.0 99999.0.0 +tar 0.4 - 99999.0.0 99999.0 +ftp 2.2.1 - 99999.0.0 99999.0.0 +te 0.1.5 - 99999.0.0 99999.0.0 +semver 0.7 - 99999.0.0 99999.0 +rn 0.1 - 99999.0.0 99999.0 +assert_cli 0.2.0 - 99999.0.0 99999.0.0 +tempdir 0.3 - 99999.0.0 99999.0 +serde 1.0 - - 1.0 +openssl 0.9 - 99999.0.0 99999.0 +rget 0.3.0 - 99999.0.0 99999.0.0 +geo 0.7.0 - 99999.0.0 99999.0.0 +ftp 2.2.1 - 99999.0.0 99999.0.0 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/upgrade_renamed.toml b/tests/cmd/upgrade/upgrade_renamed.toml index 21490f413d..d9a873805c 100644 --- a/tests/cmd/upgrade/upgrade_renamed.toml +++ b/tests/cmd/upgrade/upgrade_renamed.toml @@ -4,8 +4,10 @@ status = "success" stdout = "" stderr = """ Checking cargo-list-test-fixture's dependencies - Upgrading te: v0.1.5 -> v99999.0.0 - Upgrading rx: v0.2 -> v99999.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +te 0.1.5 - 99999.0.0 99999.0.0 +rx 0.2 - 99999.0.0 99999.0 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/upgrade_workspace.toml b/tests/cmd/upgrade/upgrade_workspace.toml index bf1e74b474..114abdcbe6 100644 --- a/tests/cmd/upgrade/upgrade_workspace.toml +++ b/tests/cmd/upgrade/upgrade_workspace.toml @@ -4,15 +4,23 @@ status = "success" stdout = "" stderr = """ Checking one's dependencies - Upgrading libc: v0.2.28 -> v99999.0.0 - Upgrading rand: v0.3 -> v99999.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 - 99999.0.0 99999.0.0 +rand 0.3 - 99999.0.0 99999.0 Checking three's dependencies - Upgrading libc: v0.2.28 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 - 99999.0.0 99999.0.0 Checking two's dependencies - Upgrading libc: v0.2.28 -> v99999.0.0 - Upgrading rand: v0.2 -> v99999.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 - 99999.0.0 99999.0.0 +rand 0.2 - 99999.0.0 99999.0 Checking four's dependencies - Upgrading libc: v0.2.28 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 - 99999.0.0 99999.0.0 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/virtual_manifest.toml b/tests/cmd/upgrade/virtual_manifest.toml index dbc03ea12c..b7fc352816 100644 --- a/tests/cmd/upgrade/virtual_manifest.toml +++ b/tests/cmd/upgrade/virtual_manifest.toml @@ -4,15 +4,23 @@ status = "success" stdout = "" stderr = """ Checking one's dependencies - Upgrading libc: v0.2.28 -> v99999.0.0 - Upgrading rand: v0.3 -> v99999.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 - 99999.0.0 99999.0.0 +rand 0.3 - 99999.0.0 99999.0 Checking three's dependencies - Upgrading libc: v0.2.28 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 - 99999.0.0 99999.0.0 Checking two's dependencies - Upgrading libc: v0.2.28 -> v99999.0.0 - Upgrading rand: v0.2 -> v99999.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 - 99999.0.0 99999.0.0 +rand 0.2 - 99999.0.0 99999.0 Checking four's dependencies - Upgrading libc: v0.2.28 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 - 99999.0.0 99999.0.0 """ fs.sandbox = true diff --git a/tests/cmd/upgrade/workspace_member_cwd.toml b/tests/cmd/upgrade/workspace_member_cwd.toml index 2f5f04e9b2..8193715b14 100644 --- a/tests/cmd/upgrade/workspace_member_cwd.toml +++ b/tests/cmd/upgrade/workspace_member_cwd.toml @@ -4,7 +4,9 @@ status = "success" stdout = "" stderr = """ Checking one's dependencies - Upgrading libc: v0.2.28 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 - 99999.0.0 99999.0.0 """ fs.sandbox = true fs.cwd = "workspace_member_cwd.in/one" diff --git a/tests/cmd/upgrade/workspace_member_manifest_path.toml b/tests/cmd/upgrade/workspace_member_manifest_path.toml index 674e46ae66..92e06851ed 100644 --- a/tests/cmd/upgrade/workspace_member_manifest_path.toml +++ b/tests/cmd/upgrade/workspace_member_manifest_path.toml @@ -4,7 +4,9 @@ status = "success" stdout = "" stderr = """ Checking one's dependencies - Upgrading libc: v0.2.28 -> v99999.0.0 +name old req locked latest new req note +==== ======= ====== ====== ======= ==== +libc 0.2.28 - 99999.0.0 99999.0.0 """ fs.sandbox = true fs.cwd = "workspace_member_cwd.in/one"