test: Ensure we don't rely on unit return values

epage · epage · commit f80fc018a60a · 2024-11-18T20:52:53.000-06:00
This will allow changing `Execs::run` return type
diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs
@@ -82,7 +82,7 @@ fn build_with_symlink_to_path_dependency_with_build_script_in_git() {
     // It is necessary to have a sub-repository and to add files so there is an index.
     let repo = git::init(&root.join("original"));
     git::add(&repo);
-    cargo_process("build").run()
+    cargo_process("build").run();
 }
 
 #[cargo_test]
diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs
@@ -5234,7 +5234,7 @@ fn dev_dep_with_links() {
         .file("bar/build.rs", "fn main() {}")
         .file("bar/src/lib.rs", "")
         .build();
-    p.cargo("check --tests").run()
+    p.cargo("check --tests").run();
 }
 
 #[cargo_test]
diff --git a/tests/testsuite/config.rs b/tests/testsuite/config.rs
@@ -1640,7 +1640,7 @@ fn cargo_target_empty_env() {
 
 "#]])
         .with_status(101)
-        .run()
+        .run();
 }
 
 #[cargo_test]
diff --git a/tests/testsuite/future_incompat_report.rs b/tests/testsuite/future_incompat_report.rs
@@ -453,5 +453,5 @@ big_update v1.0.0 has the following newer versions available: 2.0.0
 with_updates v1.0.0 has the following newer versions available: 1.0.1, 1.0.2, 3.0.1
 ...
 "#]])
-        .run()
+        .run();
 }
diff --git a/tests/testsuite/metadata.rs b/tests/testsuite/metadata.rs
@@ -3401,7 +3401,7 @@ fn metadata_links() {
 "#]]
             .is_json(),
         )
-        .run()
+        .run();
 }
 
 #[cargo_test]
diff --git a/tests/testsuite/open_namespaces.rs b/tests/testsuite/open_namespaces.rs
@@ -31,7 +31,7 @@ Caused by:
   See https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#open-namespaces for more information about the status of this feature.
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test]
@@ -100,7 +100,7 @@ fn implicit_lib_within_namespace() {
             .is_json(),
         )
         .with_stderr_data("")
-        .run()
+        .run();
 }
 
 #[cargo_test]
@@ -169,7 +169,7 @@ fn implicit_bin_within_namespace() {
             .is_json(),
         )
         .with_stderr_data("")
-        .run()
+        .run();
 }
 
 #[cargo_test]
@@ -256,7 +256,7 @@ fn explicit_bin_within_namespace() {
             .is_json(),
         )
         .with_stderr_data("")
-        .run()
+        .run();
 }
 
 #[cargo_test]
@@ -354,7 +354,7 @@ path+[ROOTURL]/foo#foo::bar@0.0.1
 
 "#]])
         .with_stderr_data("")
-        .run()
+        .run();
 }
 
 #[cargo_test]
@@ -384,7 +384,7 @@ fn update_spec_accepts_namespaced_name() {
 [LOCKING] 0 packages to latest compatible versions
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test]
@@ -414,7 +414,7 @@ fn update_spec_accepts_namespaced_pkgid() {
 [LOCKING] 0 packages to latest compatible versions
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test]
diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs
@@ -3923,7 +3923,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for
 [PACKAGED] 6 files, [FILE_SIZE]B ([FILE_SIZE]B compressed)
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test]
diff --git a/tests/testsuite/pkgid.rs b/tests/testsuite/pkgid.rs
@@ -403,5 +403,5 @@ fn pkgid_json_message_metadata_consistency() {
 "#]]
             .is_json(),
         )
-        .run()
+        .run();
 }
diff --git a/tests/testsuite/precise_pre_release.rs b/tests/testsuite/precise_pre_release.rs
@@ -39,7 +39,7 @@ if you are looking for the prerelease package it needs to be specified explicitl
 perhaps a crate was updated and forgotten to be re-vendored?
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test]
diff --git a/tests/testsuite/pub_priv.rs b/tests/testsuite/pub_priv.rs
@@ -42,7 +42,7 @@ fn exported_priv_warning() {
 src/lib.rs:3:13: [WARNING] type `FromPriv` from private dependency 'priv_dep' in public interface
 ...
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")]
@@ -87,7 +87,7 @@ fn exported_pub_dep() {
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test]
@@ -113,7 +113,7 @@ Caused by:
   See https://doc.rust-lang.org/[..]cargo/reference/unstable.html#public-dependency for more information about using this feature.
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test]
@@ -151,7 +151,7 @@ fn requires_feature() {
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test]
@@ -194,7 +194,7 @@ Caused by:
   'public' specifier can only be used on regular dependencies, not dev-dependencies
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test]
@@ -233,7 +233,7 @@ fn pub_dev_dependency_without_feature() {
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")]
@@ -291,7 +291,7 @@ Caused by:
   foo2 is public, but workspace dependencies cannot be public
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")]
@@ -336,7 +336,7 @@ fn allow_priv_in_tests() {
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")]
@@ -381,7 +381,7 @@ fn allow_priv_in_benchs() {
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")]
@@ -427,7 +427,7 @@ fn allow_priv_in_bins() {
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")]
@@ -473,7 +473,7 @@ fn allow_priv_in_examples() {
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")]
@@ -520,7 +520,7 @@ fn allow_priv_in_custom_build() {
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")]
@@ -576,7 +576,7 @@ fn publish_package_with_public_dependency() {
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")]
diff --git a/tests/testsuite/registry.rs b/tests/testsuite/registry.rs
@@ -3242,7 +3242,7 @@ fn protocol() {
 [ERROR] unsupported registry protocol `invalid` (defined in environment variable `CARGO_REGISTRIES_CRATES_IO_PROTOCOL`)
 
 "#]])
-        .run()
+        .run();
 }
 
 #[cargo_test]
@@ -3253,7 +3253,7 @@ fn http_requires_trailing_slash() {
 [ERROR] sparse registry url must end in a slash `/`: sparse+https://invalid.crates.io/test
 
 "#]])
-        .run()
+        .run();
 }
 
 // Limit the test to debug builds so that `__CARGO_TEST_MAX_UNPACK_SIZE` will take affect.
diff --git a/tests/testsuite/test.rs b/tests/testsuite/test.rs
@@ -4307,7 +4307,7 @@ fn test_hint_workspace_virtual() {
 
 "#]])
         .with_status(101)
-        .run()
+        .run();
 }
 
 #[cargo_test]

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ fn build_with_symlink_to_path_dependency_with_build_script_in_git() {`
`82`	`82`	`// It is necessary to have a sub-repository and to add files so there is an index.`
`83`	`83`	`let repo = git::init(&root.join("original"));`
`84`	`84`	`git::add(&repo);`
`85`		`- cargo_process("build").run()`
	`85`	`+ cargo_process("build").run();`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`#[cargo_test]`
Original file line number	Diff line number	Diff line change
`@@ -5234,7 +5234,7 @@ fn dev_dep_with_links() {`
`5234`	`5234`	`.file("bar/build.rs", "fn main() {}")`
`5235`	`5235`	`.file("bar/src/lib.rs", "")`
`5236`	`5236`	`.build();`
`5237`		`- p.cargo("check --tests").run()`
	`5237`	`+ p.cargo("check --tests").run();`
`5238`	`5238`	`}`
`5239`	`5239`
`5240`	`5240`	`#[cargo_test]`
Original file line number	Diff line number	Diff line change
`@@ -1640,7 +1640,7 @@ fn cargo_target_empty_env() {`
`1640`	`1640`
`1641`	`1641`	`"#]])`
`1642`	`1642`	`.with_status(101)`
`1643`		`- .run()`
	`1643`	`+ .run();`
`1644`	`1644`	`}`
`1645`	`1645`
`1646`	`1646`	`#[cargo_test]`
Original file line number	Diff line number	Diff line change
`@@ -453,5 +453,5 @@ big_update v1.0.0 has the following newer versions available: 2.0.0`
`453`	`453`	`with_updates v1.0.0 has the following newer versions available: 1.0.1, 1.0.2, 3.0.1`
`454`	`454`	`...`
`455`	`455`	`"#]])`
`456`		`- .run()`
	`456`	`+ .run();`
`457`	`457`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3401,7 +3401,7 @@ fn metadata_links() {`
`3401`	`3401`	`"#]]`
`3402`	`3402`	`.is_json(),`
`3403`	`3403`	`)`
`3404`		`- .run()`
	`3404`	`+ .run();`
`3405`	`3405`	`}`
`3406`	`3406`
`3407`	`3407`	`#[cargo_test]`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ Caused by:`
`31`	`31`	`See https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#open-namespaces for more information about the status of this feature.`
`32`	`32`
`33`	`33`	`"#]])`
`34`		`- .run()`
	`34`	`+ .run();`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`#[cargo_test]`
`@@ -100,7 +100,7 @@ fn implicit_lib_within_namespace() {`
`100`	`100`	`.is_json(),`
`101`	`101`	`)`
`102`	`102`	`.with_stderr_data("")`
`103`		`- .run()`
	`103`	`+ .run();`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`#[cargo_test]`
`@@ -169,7 +169,7 @@ fn implicit_bin_within_namespace() {`
`169`	`169`	`.is_json(),`
`170`	`170`	`)`
`171`	`171`	`.with_stderr_data("")`
`172`		`- .run()`
	`172`	`+ .run();`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`#[cargo_test]`
`@@ -256,7 +256,7 @@ fn explicit_bin_within_namespace() {`
`256`	`256`	`.is_json(),`
`257`	`257`	`)`
`258`	`258`	`.with_stderr_data("")`
`259`		`- .run()`
	`259`	`+ .run();`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`#[cargo_test]`
`@@ -354,7 +354,7 @@ path+[ROOTURL]/foo#foo::bar@0.0.1`
`354`	`354`
`355`	`355`	`"#]])`
`356`	`356`	`.with_stderr_data("")`
`357`		`- .run()`
	`357`	`+ .run();`
`358`	`358`	`}`
`359`	`359`
`360`	`360`	`#[cargo_test]`
`@@ -384,7 +384,7 @@ fn update_spec_accepts_namespaced_name() {`
`384`	`384`	`[LOCKING] 0 packages to latest compatible versions`
`385`	`385`
`386`	`386`	`"#]])`
`387`		`- .run()`
	`387`	`+ .run();`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`#[cargo_test]`
`@@ -414,7 +414,7 @@ fn update_spec_accepts_namespaced_pkgid() {`
`414`	`414`	`[LOCKING] 0 packages to latest compatible versions`
`415`	`415`
`416`	`416`	`"#]])`
`417`		`- .run()`
	`417`	`+ .run();`
`418`	`418`	`}`
`419`	`419`
`420`	`420`	`#[cargo_test]`
Original file line number	Diff line number	Diff line change
`@@ -3923,7 +3923,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for`
`3923`	`3923`	`[PACKAGED] 6 files, [FILE_SIZE]B ([FILE_SIZE]B compressed)`
`3924`	`3924`
`3925`	`3925`	`"#]])`
`3926`		`- .run()`
	`3926`	`+ .run();`
`3927`	`3927`	`}`
`3928`	`3928`
`3929`	`3929`	`#[cargo_test]`
Original file line number	Diff line number	Diff line change
`@@ -403,5 +403,5 @@ fn pkgid_json_message_metadata_consistency() {`
`403`	`403`	`"#]]`
`404`	`404`	`.is_json(),`
`405`	`405`	`)`
`406`		`- .run()`
	`406`	`+ .run();`
`407`	`407`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ if you are looking for the prerelease package it needs to be specified explicitl`
`39`	`39`	`perhaps a crate was updated and forgotten to be re-vendored?`
`40`	`40`
`41`	`41`	`"#]])`
`42`		`- .run()`
	`42`	`+ .run();`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`#[cargo_test]`