Skip to content

Commit 61fb34b

Browse files
committed
Allow a number of tests to run on stable
These tests all relied on support which has now ridden to stable at this point, so let's let them run on stable!
1 parent d8e62ee commit 61fb34b

File tree

5 files changed

+3
-51
lines changed

5 files changed

+3
-51
lines changed

tests/testsuite/build.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4540,10 +4540,6 @@ Caused by:
45404540

45414541
#[cargo_test]
45424542
fn tricky_pipelining() {
4543-
if !cargo_test_support::is_nightly() {
4544-
return;
4545-
}
4546-
45474543
let foo = project()
45484544
.file(
45494545
"Cargo.toml",
@@ -4570,10 +4566,6 @@ fn tricky_pipelining() {
45704566

45714567
#[cargo_test]
45724568
fn pipelining_works() {
4573-
if !cargo_test_support::is_nightly() {
4574-
return;
4575-
}
4576-
45774569
let foo = project()
45784570
.file(
45794571
"Cargo.toml",
@@ -4605,10 +4597,6 @@ fn pipelining_works() {
46054597

46064598
#[cargo_test]
46074599
fn pipelining_big_graph() {
4608-
if !cargo_test_support::is_nightly() {
4609-
return;
4610-
}
4611-
46124600
// Create a crate graph of the form {a,b}{0..29}, where {a,b}(n) depend on {a,b}(n+1)
46134601
// Then have `foo`, a binary crate, depend on the whole thing.
46144602
let mut project = project()

tests/testsuite/fix.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::fs::File;
22

33
use cargo_test_support::git;
4-
use cargo_test_support::{basic_manifest, clippy_is_available, is_nightly, project};
4+
use cargo_test_support::{basic_manifest, clippy_is_available, project};
55

66
use std::io::Write;
77

@@ -1251,12 +1251,6 @@ fn fix_in_existing_repo_weird_ignore() {
12511251

12521252
#[cargo_test]
12531253
fn fix_with_clippy() {
1254-
if !is_nightly() {
1255-
// fix --clippy is unstable
1256-
eprintln!("skipping test: requires nightly");
1257-
return;
1258-
}
1259-
12601254
if !clippy_is_available() {
12611255
return;
12621256
}

tests/testsuite/message_format.rs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ use cargo_test_support::{basic_manifest, project};
22

33
#[cargo_test]
44
fn cannot_specify_two() {
5-
if !cargo_test_support::is_nightly() {
6-
return;
7-
}
8-
95
let p = project()
106
.file("Cargo.toml", &basic_manifest("foo", "0.1.0"))
117
.file("src/main.rs", "fn main() {}")
@@ -26,10 +22,6 @@ fn cannot_specify_two() {
2622

2723
#[cargo_test]
2824
fn double_json_works() {
29-
if !cargo_test_support::is_nightly() {
30-
return;
31-
}
32-
3325
let p = project()
3426
.file("Cargo.toml", &basic_manifest("foo", "0.1.0"))
3527
.file("src/main.rs", "fn main() {}")
@@ -51,10 +43,6 @@ fn double_json_works() {
5143

5244
#[cargo_test]
5345
fn cargo_renders() {
54-
if !cargo_test_support::is_nightly() {
55-
return;
56-
}
57-
5846
let p = project()
5947
.file(
6048
"Cargo.toml",
@@ -87,10 +75,6 @@ error[..]`main`[..]
8775

8876
#[cargo_test]
8977
fn cargo_renders_short() {
90-
if !cargo_test_support::is_nightly() {
91-
return;
92-
}
93-
9478
let p = project()
9579
.file("Cargo.toml", &basic_manifest("foo", "0.1.0"))
9680
.file("src/main.rs", "")
@@ -110,10 +94,6 @@ error[..]`main`[..]
11094

11195
#[cargo_test]
11296
fn cargo_renders_ansi() {
113-
if !cargo_test_support::is_nightly() {
114-
return;
115-
}
116-
11797
let p = project()
11898
.file("Cargo.toml", &basic_manifest("foo", "0.1.0"))
11999
.file("src/main.rs", "")

tests/testsuite/profile_config.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use cargo_test_support::{basic_lib_manifest, is_nightly, paths, project};
1+
use cargo_test_support::{basic_lib_manifest, paths, project};
22

33
#[cargo_test]
44
fn profile_config_gated() {
@@ -230,11 +230,6 @@ found profile override specs: bar, bar:0.5.0",
230230

231231
#[cargo_test]
232232
fn profile_config_all_options() {
233-
if !is_nightly() {
234-
// May be removed once 1.34 is stable (added support for incremental-LTO).
235-
return;
236-
}
237-
238233
// Ensure all profile options are supported.
239234
let p = project()
240235
.file("src/main.rs", "fn main() {}")

tests/testsuite/timings.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1+
use cargo_test_support::project;
12
use cargo_test_support::registry::Package;
2-
use cargo_test_support::{is_nightly, project};
33

44
#[cargo_test]
55
fn timings_works() {
6-
if !is_nightly() {
7-
// Requires --json flag, remove this check in 1.38.
8-
return;
9-
}
10-
116
Package::new("dep", "0.1.0").publish();
127

138
let p = project()

0 commit comments

Comments
 (0)