Skip to content
This repository has been archived by the owner on Aug 15, 2024. It is now read-only.

Commit

Permalink
refactor: Resolve deprecations
Browse files Browse the repository at this point in the history
  • Loading branch information
@epage
epage committed May 24, 2024
1 parent a910f5d commit 5aba890
Show file tree
Hide file tree
Showing 29 changed files with 66 additions and 66 deletions.
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/basic/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@ fn case() {
.arg("--registry=dummy-registry")
.assert()
.success()
.stdout_matches(file!["stdout.term.svg"])
.stderr_matches(file!["stderr.term.svg"]);
.stdout_eq_(file!["stdout.term.svg"])
.stderr_eq_(file!["stderr.term.svg"]);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/features/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ fn case() {
.arg("--registry=dummy-registry")
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/features_activated_over_limit/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ fn case() {
.arg("--registry=dummy-registry")
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/features_activated_over_limit_verbose/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ fn case() {
.arg("--registry=dummy-registry")
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/features_deactivated_over_limit/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ fn case() {
.arg("--registry=dummy-registry")
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/git_dependency/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ fn case() {
.current_dir(cwd)
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/help/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ fn case() {
.arg("--registry=dummy-registry")
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/not_found/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ fn case() {
.current_dir(cwd)
.assert()
.failure()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);

assert_ui().subset_matches(current_dir!().join("out"), &project_root);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/path_dependency/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ fn case() {
.current_dir(cwd)
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);

assert_ui().subset_matches(current_dir!().join("out"), &project_root);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/pick_msrv_compatible_package/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ fn case() {
.arg("--registry=dummy-registry")
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/pick_msrv_compatible_package_within_ws/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ fn case() {
.current_dir(cwd)
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);

assert_ui().subset_matches(current_dir!().join("out"), &project_root);
}
4 changes: 2 additions & 2 deletions ...uite/cargo_information/pick_msrv_compatible_package_within_ws_and_use_msrv_from_ws/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ fn case() {
.current_dir(cwd)
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);

assert_ui().subset_matches(current_dir!().join("out"), &project_root);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/specify_empty_version_with_url/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ fn case() {
.arg("--registry=alternative")
.assert()
.failure()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/specify_version_outside_ws/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ fn case() {
.arg("--registry=dummy-registry")
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);
}
4 changes: 2 additions & 2 deletions ...s/testsuite/cargo_information/specify_version_with_url_but_registry_is_not_matched/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ fn case() {
.arg("--registry=alternative")
.assert()
.failure()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);
}
4 changes: 2 additions & 2 deletions ...s/testsuite/cargo_information/specify_version_within_ws_and_conflict_with_lockfile/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ fn case() {
.current_dir(cwd)
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);

assert_ui().subset_matches(current_dir!().join("out"), &project_root);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/specify_version_within_ws_and_match_with_lockfile/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ fn case() {
.current_dir(cwd)
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);

assert_ui().subset_matches(current_dir!().join("out"), &project_root);
}
20 changes: 10 additions & 10 deletions tests/testsuite/cargo_information/transitive_dependency_within_ws/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,36 +38,36 @@ fn case() {
.arg("--registry=dummy-registry")
.current_dir(ws_directory)
.assert()
.stdout_matches(file!["ws.stdout.log"])
.stderr_matches(file!["ws.stderr.log"]);
.stdout_eq_(file!["ws.stdout.log"])
.stderr_eq_(file!["ws.stderr.log"]);
cargo_info()
.arg("my-package")
.arg("--registry=dummy-registry")
.current_dir(transitive1_directory)
.assert()
.stdout_matches(file!["transitive1.stdout.log"])
.stderr_matches(file!["transitive1.stderr.log"]);
.stdout_eq_(file!["transitive1.stdout.log"])
.stderr_eq_(file!["transitive1.stderr.log"]);
cargo_info()
.arg("my-package")
.arg("--registry=dummy-registry")
.current_dir(transitive2_directory)
.assert()
.stdout_matches(file!["transitive2.stdout.log"])
.stderr_matches(file!["transitive2.stderr.log"]);
.stdout_eq_(file!["transitive2.stdout.log"])
.stderr_eq_(file!["transitive2.stderr.log"]);
cargo_info()
.arg("my-package")
.arg("--registry=dummy-registry")
.current_dir(direct1_directory)
.assert()
.stdout_matches(file!["direct1.stdout.log"])
.stderr_matches(file!["direct1.stderr.log"]);
.stdout_eq_(file!["direct1.stdout.log"])
.stderr_eq_(file!["direct1.stderr.log"]);
cargo_info()
.arg("my-package")
.arg("--registry=dummy-registry")
.current_dir(direct2_directory)
.assert()
.stdout_matches(file!["direct2.stdout.log"])
.stderr_matches(file!["direct2.stderr.log"]);
.stdout_eq_(file!["direct2.stdout.log"])
.stderr_eq_(file!["direct2.stderr.log"]);

assert_ui().subset_matches(current_dir!().join("out"), &project_root);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/verbose/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ fn case() {
.arg("--registry=dummy-registry")
.assert()
.success()
.stdout_matches(file!["stdout.term.svg"])
.stderr_matches(file!["stderr.term.svg"]);
.stdout_eq_(file!["stdout.term.svg"])
.stderr_eq_(file!["stderr.term.svg"]);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/with_frozen_outside_ws/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ fn case() {
.arg("--registry=dummy-registry")
.assert()
.failure()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/with_frozen_within_ws/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ fn case() {
.current_dir(cwd)
.assert()
.failure()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);

assert_ui().subset_matches(current_dir!().join("out"), &project_root);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/with_locked_outside_ws/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ fn case() {
.arg("--registry=dummy-registry")
.assert()
.failure()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/with_locked_within_ws/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ fn case() {
.current_dir(cwd)
.assert()
.failure()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);

assert_ui().subset_matches(current_dir!().join("out"), &project_root);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/with_offline/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ fn case() {
.arg("--registry=dummy-registry")
.assert()
.failure()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/with_quiet/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ fn case() {
.arg("--registry=dummy-registry")
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/within_ws/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ fn case() {
.current_dir(cwd)
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);

assert_ui().subset_matches(current_dir!().join("out"), &project_root);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/within_ws_and_pick_ws_package/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ fn case() {
.current_dir(cwd)
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);

assert_ui().subset_matches(current_dir!().join("out"), &project_root);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/within_ws_with_alternative_registry/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ fn case() {
.current_dir(cwd)
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);

assert_ui().subset_matches(current_dir!().join("out"), &project_root);
}
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_information/within_ws_without_lockfile/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ fn case() {
.current_dir(cwd)
.assert()
.success()
.stdout_matches(file!["stdout.log"])
.stderr_matches(file!["stderr.log"]);
.stdout_eq_(file!["stdout.log"])
.stderr_eq_(file!["stderr.log"]);

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

0 comments on commit 5aba890

Please sign in to comment.