Skip to content

Commit 23fa400

Browse files
committed
Auto merge of #6630 - dwijnand:test-cleanup/remove-unnecessary-with_status_0, r=alexcrichton
Test cleanup: remove unnecessary with_status(0) (WTB project-specific clippy lints/rustfix rewrites...)
2 parents 1c03264 + 37df042 commit 23fa400

File tree

8 files changed

+5
-29
lines changed

8 files changed

+5
-29
lines changed

tests/testsuite/build.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4628,13 +4628,11 @@ Did you mean `ex1`?",
46284628
.run();
46294629

46304630
ws.cargo("build -v --lib")
4631-
.with_status(0)
46324631
.with_stderr_contains("[RUNNING] `rustc [..]a/src/lib.rs[..]")
46334632
.with_stderr_contains("[RUNNING] `rustc [..]b/src/lib.rs[..]")
46344633
.run();
46354634

46364635
ws.cargo("build -v --example ex1")
4637-
.with_status(0)
46384636
.with_stderr_contains("[RUNNING] `rustc [..]a/examples/ex1.rs[..]")
46394637
.run();
46404638
}

tests/testsuite/directory.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,6 @@ fn workspace_different_locations() {
713713
p.cargo("build").cwd(p.root().join("foo")).run();
714714
p.cargo("build")
715715
.cwd(p.root().join("bar"))
716-
.with_status(0)
717716
.with_stderr(
718717
"\
719718
[COMPILING] bar [..]

tests/testsuite/edition.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,5 @@ fn edition_works_for_build_script() {
3232
.file("a/src/lib.rs", "pub fn foo() {}")
3333
.build();
3434

35-
p.cargo("build -v")
36-
.masquerade_as_nightly_cargo()
37-
.with_status(0)
38-
.run();
35+
p.cargo("build -v").masquerade_as_nightly_cargo().run();
3936
}

tests/testsuite/fix.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,6 @@ fn fix_idioms() {
943943
";
944944
p.cargo("fix --edition-idioms --allow-no-vcs")
945945
.with_stderr(stderr)
946-
.with_status(0)
947946
.run();
948947

949948
assert!(p.read_file("src/lib.rs").contains("Box<dyn Any>"));
@@ -955,7 +954,6 @@ fn idioms_2015_ok() {
955954

956955
p.cargo("fix --edition-idioms --allow-no-vcs")
957956
.masquerade_as_nightly_cargo()
958-
.with_status(0)
959957
.run();
960958
}
961959

tests/testsuite/package.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,10 +1263,7 @@ fn package_with_select_features() {
12631263
)
12641264
.build();
12651265

1266-
p.cargo("package --features required")
1267-
.masquerade_as_nightly_cargo()
1268-
.with_status(0)
1269-
.run();
1266+
p.cargo("package --features required").masquerade_as_nightly_cargo().run();
12701267
}
12711268

12721269
#[test]
@@ -1295,10 +1292,7 @@ fn package_with_all_features() {
12951292
)
12961293
.build();
12971294

1298-
p.cargo("package --all-features")
1299-
.masquerade_as_nightly_cargo()
1300-
.with_status(0)
1301-
.run();
1295+
p.cargo("package --all-features").masquerade_as_nightly_cargo().run();
13021296
}
13031297

13041298
#[test]

tests/testsuite/registry.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,6 @@ required by package `foo v0.0.1 ([..])`
635635
.run();
636636

637637
p.cargo("update -p baz")
638-
.with_status(0)
639638
.with_stderr_contains(
640639
"\
641640
[UPDATING] `[..]` index

tests/testsuite/run.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,10 +1098,7 @@ fn run_workspace() {
10981098
available binaries: a, b",
10991099
)
11001100
.run();
1101-
p.cargo("run --bin a")
1102-
.with_status(0)
1103-
.with_stdout("run-a")
1104-
.run();
1101+
p.cargo("run --bin a").with_stdout("run-a").run();
11051102
}
11061103

11071104
#[test]
@@ -1130,11 +1127,7 @@ fn default_run_workspace() {
11301127
.file("b/src/main.rs", r#"fn main() {println!("run-b");}"#)
11311128
.build();
11321129

1133-
p.cargo("run")
1134-
.masquerade_as_nightly_cargo()
1135-
.with_status(0)
1136-
.with_stdout("run-a")
1137-
.run();
1130+
p.cargo("run").masquerade_as_nightly_cargo().with_stdout("run-a").run();
11381131
}
11391132

11401133
#[test]

tests/testsuite/workspaces.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2074,7 +2074,6 @@ fn ws_warn_unused() {
20742074
.file("a/src/lib.rs", "")
20752075
.build();
20762076
p.cargo("check")
2077-
.with_status(0)
20782077
.with_stderr_contains(&format!(
20792078
"\
20802079
[WARNING] {} for the non root package will be ignored, specify {} at the workspace root:
@@ -2111,7 +2110,6 @@ fn ws_warn_path() {
21112110
.build();
21122111

21132112
p.cargo("check")
2114-
.with_status(0)
21152113
.with_stderr_contains("[WARNING] [..]/foo/a/Cargo.toml: the cargo feature `edition`[..]")
21162114
.run();
21172115
}

0 commit comments

Comments
 (0)