Skip to content

Commit 5c19611

Browse files
committed
Update tests now that 1.88 is stable
1 parent d36c0ae commit 5c19611

File tree

4 files changed

+9
-26
lines changed

4 files changed

+9
-26
lines changed

tests/testsuite/build_script.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5602,17 +5602,14 @@ test check_target ... ok
56025602
"#]])
56035603
.run();
56045604

5605-
// Remove check once 1.88 is stable
5606-
if cargo_test_support::is_nightly() {
5607-
p.cargo("test --workspace --doc --target")
5608-
.arg(&target)
5609-
.with_stdout_data(str![[r#"
5605+
p.cargo("test --workspace --doc --target")
5606+
.arg(&target)
5607+
.with_stdout_data(str![[r#"
56105608
...
56115609
test foo/src/lib.rs - (line 2) ... ok
56125610
...
56135611
"#]])
5614-
.run();
5615-
}
5612+
.run();
56165613
}
56175614

56185615
#[cargo_test]

tests/testsuite/cross_compile.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1136,10 +1136,7 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini
11361136
.run();
11371137
}
11381138

1139-
#[cargo_test(
1140-
nightly,
1141-
reason = "waiting for 1.88 to be stable for doctest xcompile flags"
1142-
)]
1139+
#[cargo_test]
11431140
fn doctest_xcompile_linker() {
11441141
if cross_compile_disabled() {
11451142
return;

tests/testsuite/global_cache_tracker.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1987,11 +1987,9 @@ fn compatible_with_older_cargo() {
19871987
middle = "1.0"
19881988
"#,
19891989
);
1990-
// TODO: Remove -Zgc after 1.82 is stabilized.
19911990
rustup_cargo()
1992-
.args(&["+stable", "check", "-Zgc"])
1991+
.args(&["+stable", "check"])
19931992
.cwd(p.root())
1994-
.masquerade_as_nightly_cargo(&["gc"])
19951993
.env("__CARGO_TEST_LAST_USE_NOW", months_ago_unix(2))
19961994
.run();
19971995
assert_eq!(get_registry_names("src"), ["middle-1.0.0", "new-1.0.0"]);

tests/testsuite/test.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4742,10 +4742,7 @@ fn test_dep_with_dev() {
47424742
.run();
47434743
}
47444744

4745-
#[cargo_test(
4746-
nightly,
4747-
reason = "waiting for 1.88 to be stable for doctest xcompile flags"
4748-
)]
4745+
#[cargo_test]
47494746
fn cargo_test_doctest_xcompile_ignores() {
47504747
// Check ignore-TARGET syntax.
47514748
let p = project()
@@ -4782,10 +4779,7 @@ test result: ok. 0 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out; fini
47824779
.run();
47834780
}
47844781

4785-
#[cargo_test(
4786-
nightly,
4787-
reason = "waiting for 1.88 to be stable for doctest xcompile flags"
4788-
)]
4782+
#[cargo_test]
47894783
fn cargo_test_doctest_xcompile_runner() {
47904784
if !cross_compile_can_run_on_host() {
47914785
return;
@@ -4868,10 +4862,7 @@ this is a runner
48684862
.run();
48694863
}
48704864

4871-
#[cargo_test(
4872-
nightly,
4873-
reason = "waiting for 1.88 to be stable for doctest xcompile flags"
4874-
)]
4865+
#[cargo_test]
48754866
fn cargo_test_doctest_xcompile_no_runner() {
48764867
if !cross_compile_can_run_on_host() {
48774868
return;

0 commit comments

Comments
 (0)