Skip to content

Commit

Permalink
Merge pull request #759 from epage/collapse
Browse files Browse the repository at this point in the history 
fix(upgrade): Abbreviate the table
  • Loading branch information
@epage
epage authored Jul 29, 2022
2 parents d31fe7e + 07ba3b7 commit 5ef94b9
Show file tree
Hide file tree
Showing 33 changed files with 492 additions and 245 deletions.
314 changes: 210 additions & 104 deletions src/bin/upgrade/upgrade.rs
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions tests/cargo-upgrade/alt_registry/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Updating '[ROOTURL]/registry' index
Checking none's dependencies
Updating '[ROOTURL]/alternative-registry' index
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package1 0.1.1 0.1.1 99999.0.0 99999.0.0
my-package2 0.2 0.2.3 99999.0.0 99999.0
name old req locked latest new req
==== ======= ====== ====== =======
my-package1 0.1.1 0.1.1 99999.0.0 99999.0.0
my-package2 0.2 0.2.3 99999.0.0 99999.0
6 changes: 3 additions & 3 deletions tests/cargo-upgrade/dry_run/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Updating '[ROOTURL]/registry' index
Checking cargo-list-test-fixture's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package 0.1.1 0.1.1 99999.0.0 99999.0.0
name old req locked latest new req
==== ======= ====== ====== =======
my-package 0.1.1 0.1.1 99999.0.0 99999.0.0
warning: aborting upgrade due to dry run
34 changes: 17 additions & 17 deletions tests/cargo-upgrade/exclude_dep/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Updating '[ROOTURL]/registry' index
Checking None's dependencies
warning: ignoring docopt, excluded by user
name old req locked latest new req note
==== ======= ====== ====== ======= ====
pad 0.1 0.1.1 99999.0.0 99999.0
serde_json 20.0 20.0.0 99999.0.0 99999.0
syn 0.1.1 0.1.1 99999.0.0 99999.0.0
tar 0.4 0.4.1 99999.0.0 99999.0
ftp 20.0.0 20.0.0 99999.0.0 99999.0.0
te 0.1.1 0.1.1 99999.0.0 99999.0.0
semver 0.2 0.2.3 99999.0.0 99999.0
rn 0.1 0.1.1 99999.0.0 99999.0
assert_cli 0.2.0 0.2.3 99999.0.0 99999.0.0
tempdir 0.1 0.1.1 99999.0.0 99999.0
serde 1.0 1.0.140 - 1.0
openssl 0.4 0.4.1 99999.0.0 99999.0
rget 0.4.0 0.4.1 99999.0.0 99999.0.0
geo 0.2.0 0.2.3 99999.0.0 99999.0.0
ftp 0.2.0 0.2.3 99999.0.0 99999.0.0
name old req locked latest new req
==== ======= ====== ====== =======
pad 0.1 0.1.1 99999.0.0 99999.0
serde_json 20.0 20.0.0 99999.0.0 99999.0
syn 0.1.1 0.1.1 99999.0.0 99999.0.0
tar 0.4 0.4.1 99999.0.0 99999.0
ftp 20.0.0 20.0.0 99999.0.0 99999.0.0
te 0.1.1 0.1.1 99999.0.0 99999.0.0
semver 0.2 0.2.3 99999.0.0 99999.0
rn 0.1 0.1.1 99999.0.0 99999.0
assert_cli 0.2.0 0.2.3 99999.0.0 99999.0.0
tempdir 0.1 0.1.1 99999.0.0 99999.0
serde 1.0 1.0.140 - 1.0
openssl 0.4 0.4.1 99999.0.0 99999.0
rget 0.4.0 0.4.1 99999.0.0 99999.0.0
geo 0.2.0 0.2.3 99999.0.0 99999.0.0
ftp 0.2.0 0.2.3 99999.0.0 99999.0.0
8 changes: 4 additions & 4 deletions tests/cargo-upgrade/implicit_prerelease/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Updating '[ROOTURL]/registry' index
Checking cargo-list-test-fixture's dependencies
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
name old req locked latest new req
==== ======= ====== ====== =======
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
6 changes: 3 additions & 3 deletions tests/cargo-upgrade/locked/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Updating '[ROOTURL]/registry' index
Checking cargo-list-test-fixture's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package 0.1.1 - 99999.0.0 99999.0.0
name old req locked latest new req
==== ======= ====== ====== =======
my-package 0.1.1 - 99999.0.0 99999.0.0
Error: cannot upgrade due to `--locked`
1 change: 1 addition & 0 deletions tests/cargo-upgrade/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ mod to_version;
mod upgrade_all;
mod upgrade_everything;
mod upgrade_renamed;
mod upgrade_verbose;
mod upgrade_workspace;
mod virtual_manifest;
mod workspace_member_cwd;
Expand Down
6 changes: 3 additions & 3 deletions tests/cargo-upgrade/optional_dep/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Updating '[ROOTURL]/registry' index
Checking cargo-list-test-fixture's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package 0.1.1 0.1.1 99999.0.0 99999.0.0
name old req locked latest new req
==== ======= ====== ====== =======
my-package 0.1.1 0.1.1 99999.0.0 99999.0.0
6 changes: 3 additions & 3 deletions tests/cargo-upgrade/preserve_precision_major/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Updating '[ROOTURL]/registry' index
Checking cargo-list-test-fixture's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package 0 0.4.1 99999.0.0 99999
name old req locked latest new req
==== ======= ====== ====== =======
my-package 0 0.4.1 99999.0.0 99999
6 changes: 3 additions & 3 deletions tests/cargo-upgrade/preserve_precision_minor/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Updating '[ROOTURL]/registry' index
Checking cargo-list-test-fixture's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package 0.1 0.1.1 99999.0.0 99999.0
name old req locked latest new req
==== ======= ====== ====== =======
my-package 0.1 0.1.1 99999.0.0 99999.0
6 changes: 3 additions & 3 deletions tests/cargo-upgrade/preserve_precision_patch/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Updating '[ROOTURL]/registry' index
Checking cargo-list-test-fixture's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package 0.1.1 0.1.1 99999.0.0 99999.0.0
name old req locked latest new req
==== ======= ====== ====== =======
my-package 0.1.1 0.1.1 99999.0.0 99999.0.0
6 changes: 3 additions & 3 deletions tests/cargo-upgrade/preserves_inline_table/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Updating '[ROOTURL]/registry' index
Checking cargo-list-test-fixture's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package 0.1.1 0.1.1 99999.0.0 99999.0.0
name old req locked latest new req
==== ======= ====== ====== =======
my-package 0.1.1 0.1.1 99999.0.0 99999.0.0
6 changes: 3 additions & 3 deletions tests/cargo-upgrade/preserves_std_table/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Updating '[ROOTURL]/registry' index
Checking cargo-list-test-fixture's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package 0.1.1 0.1.1 99999.0.0 99999.0.0
name old req locked latest new req
==== ======= ====== ====== =======
my-package 0.1.1 0.1.1 99999.0.0 99999.0.0
6 changes: 3 additions & 3 deletions tests/cargo-upgrade/single_dep/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Updating '[ROOTURL]/registry' index
Checking cargo-list-test-fixture's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package 0.1.1 0.1.1 99999.0.0 99999.0.0
name old req locked latest new req
==== ======= ====== ====== =======
my-package 0.1.1 0.1.1 99999.0.0 99999.0.0
6 changes: 3 additions & 3 deletions tests/cargo-upgrade/specified/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Updating '[ROOTURL]/registry' index
Checking cargo-list-test-fixture's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package1 0.1 0.1.1 99999.0.0 99999.0
name old req locked latest new req
==== ======= ====== ====== =======
my-package1 0.1 0.1.1 99999.0.0 99999.0
26 changes: 13 additions & 13 deletions tests/cargo-upgrade/to_lockfile/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Checking one's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package 0.2.0 0.2.3 99999.0.0 0.2.3
three 0.1.0 0.1.5 - 0.1.5
name old req locked latest new req
==== ======= ====== ====== =======
my-package 0.2.0 0.2.3 99999.0.0 0.2.3
three 0.1.0 0.1.5 - 0.1.5
Checking three's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package 0.2.0 0.2.3 99999.0.0 0.2.3
name old req locked latest new req
==== ======= ====== ====== =======
my-package 0.2.0 0.2.3 99999.0.0 0.2.3
Checking two's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package 0.2.0 0.2.3 99999.0.0 0.2.3
name old req locked latest new req
==== ======= ====== ====== =======
my-package 0.2.0 0.2.3 99999.0.0 0.2.3
Checking four's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package 0.2.0 0.2.3 99999.0.0 0.2.3
name old req locked latest new req
==== ======= ====== ====== =======
my-package 0.2.0 0.2.3 99999.0.0 0.2.3
6 changes: 3 additions & 3 deletions tests/cargo-upgrade/to_version/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Updating '[ROOTURL]/registry' index
Checking cargo-list-test-fixture's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
docopt 0.4.0 0.4.1 99999.0.0 99999.0.0
name old req locked latest new req
==== ======= ====== ====== =======
docopt 0.4.0 0.4.1 99999.0.0 99999.0.0
2 changes: 1 addition & 1 deletion tests/cargo-upgrade/upgrade_all/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fn case() {

snapbox::cmd::Command::cargo_ui()
.arg("upgrade")
.args(["--all"])
.args(["--all", "--verbose"])
.current_dir(cwd)
.assert()
.success()
Expand Down
26 changes: 13 additions & 13 deletions tests/cargo-upgrade/upgrade_all/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
The flag `--all` has been deprecated in favor of `--workspace`
Updating '[ROOTURL]/registry' index
Checking one's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package 0.2.0 0.2.3 99999.0.0 99999.0.0
three 0.1.0 0.1.5 - 0.1.0
name old req locked latest new req
==== ======= ====== ====== =======
my-package 0.2.0 0.2.3 99999.0.0 99999.0.0
three 0.1.0 0.1.5 - 0.1.0
Checking three's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package 0.2.0 0.2.3 99999.0.0 99999.0.0
name old req locked latest new req
==== ======= ====== ====== =======
my-package 0.2.0 0.2.3 99999.0.0 99999.0.0
Checking two's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package 0.2.0 0.2.3 99999.0.0 99999.0.0
name old req locked latest new req
==== ======= ====== ====== =======
my-package 0.2.0 0.2.3 99999.0.0 99999.0.0
Checking four's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
my-package 0.2.0 0.2.3 99999.0.0 99999.0.0
name old req locked latest new req
==== ======= ====== ====== =======
my-package 0.2.0 0.2.3 99999.0.0 99999.0.0
37 changes: 19 additions & 18 deletions tests/cargo-upgrade/upgrade_everything/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
Updating '[ROOTURL]/registry' index
Checking None's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
docopt 0.4 0.4.1 99999.0.0 99999.0
pad 0.1 0.1.1 99999.0.0 99999.0
serde_json 20.0 20.0.0 99999.0.0 99999.0
syn 0.1.1 0.1.1 99999.0.0 99999.0.0
tar 0.4 0.4.1 99999.0.0 99999.0
ftp 20.0.0 20.0.0 99999.0.0 99999.0.0
te 0.1.1 0.1.1 99999.0.0 99999.0.0
semver 0.2 0.2.3 99999.0.0 99999.0
rn 0.1 0.1.1 99999.0.0 99999.0
assert_cli 0.2.0 0.2.3 99999.0.0 99999.0.0
tempdir 0.1 0.1.1 99999.0.0 99999.0
serde 1.0 1.0.140 - 1.0
openssl 0.4 0.4.1 99999.0.0 99999.0
rget 0.4.0 0.4.1 99999.0.0 99999.0.0
geo 0.2.0 0.2.3 99999.0.0 99999.0.0
ftp 0.2.0 0.2.3 99999.0.0 99999.0.0
name old req locked latest new req
==== ======= ====== ====== =======
docopt 0.4 0.4.1 99999.0.0 99999.0
pad 0.1 0.1.1 99999.0.0 99999.0
serde_json 20.0 20.0.0 99999.0.0 99999.0
syn 0.1.1 0.1.1 99999.0.0 99999.0.0
tar 0.4 0.4.1 99999.0.0 99999.0
ftp 20.0.0 20.0.0 99999.0.0 99999.0.0
te 0.1.1 0.1.1 99999.0.0 99999.0.0
semver 0.2 0.2.3 99999.0.0 99999.0
rn 0.1 0.1.1 99999.0.0 99999.0
assert_cli 0.2.0 0.2.3 99999.0.0 99999.0.0
tempdir 0.1 0.1.1 99999.0.0 99999.0
openssl 0.4 0.4.1 99999.0.0 99999.0
rget 0.4.0 0.4.1 99999.0.0 99999.0.0
geo 0.2.0 0.2.3 99999.0.0 99999.0.0
ftp 0.2.0 0.2.3 99999.0.0 99999.0.0
note: Re-run with `--verbose` to show all dependencies
unchanged: serde
8 changes: 4 additions & 4 deletions tests/cargo-upgrade/upgrade_renamed/stderr.log
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Updating '[ROOTURL]/registry' index
Checking cargo-list-test-fixture's dependencies
name old req locked latest new req note
==== ======= ====== ====== ======= ====
m1 0.1.1 0.1.1 99999.0.0 99999.0.0
m2 0.2 0.2.3 99999.0.0 99999.0
name old req locked latest new req
==== ======= ====== ====== =======
m1 0.1.1 0.1.1 99999.0.0 99999.0.0
m2 0.2 0.2.3 99999.0.0 99999.0
47 changes: 47 additions & 0 deletions tests/cargo-upgrade/upgrade_verbose/in/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
[package]
name = "None"
version = "0.1.0"

[lib]
path = "dummy.rs"

[dependencies]
docopt = "0.4"
pad = "0.1"
serde_json = "20.0"
syn = { version = "0.1.1", default-features = false }
tar = { version = "0.4", default-features = false }
ftp = "20.0.0"
te = { package = "toml_edit", version = "0.1.1" }

[dependencies.semver]
version = "0.2"

[dependencies.rn]
package = "renamed"
version = "0.1"

[dev-dependencies]
assert_cli = "0.2.0"
tempdir = "0.1"

[build-dependencies]
serde = { version = "1.0", git= "https://github.com/serde-rs/serde.git" }

[target.'cfg(unix)'.dependencies]
openssl = "0.4"

[target."windows.json"]
# let's make it an inline table
dependencies = { rget = "0.4.0" }

[target.'cfg(target_arch = "x86_64")'.dev-dependencies]
geo = { version = "0.2.0", default-features = false }

[target.foo.build-dependencies]
ftp = "0.2.0"

[features]
default = []
test-external-apis = []
unstable = []
Empty file added tests/cargo-upgrade/upgrade_verbose/in/src/lib.rs
View file
Empty file.
25 changes: 25 additions & 0 deletions tests/cargo-upgrade/upgrade_verbose/mod.rs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
use cargo_test_support::compare::assert_ui;
use cargo_test_support::Project;

use crate::init_registry;
use crate::CargoCommand;
use cargo_test_support::curr_dir;

#[cargo_test]
fn case() {
init_registry();
let project = Project::from_template(curr_dir!().join("in"));
let project_root = project.root();
let cwd = &project_root;

snapbox::cmd::Command::cargo_ui()
.arg("upgrade")
.args(["--pinned", "--verbose"])
.current_dir(cwd)
.assert()
.success()
.stdout_matches_path(curr_dir!().join("stdout.log"))
.stderr_matches_path(curr_dir!().join("stderr.log"));

assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
}
Loading

0 comments on commit 5ef94b9

Please sign in to comment.