Skip to content

Commit 33d7b0a

Browse files
authored
test: Remove unused nightly requirements (#15498)
### What does this PR try to resolve? ### How should we test and review this PR? ### Additional information
2 parents 7bdd872 + b81c676 commit 33d7b0a

File tree

4 files changed

+36
-36
lines changed

4 files changed

+36
-36
lines changed

tests/testsuite/fix.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@ fn prepare_for_already_on_latest_unstable() {
966966
.run();
967967
}
968968

969-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
969+
#[cargo_test]
970970
fn prepare_for_already_on_latest_stable() {
971971
// Stable counterpart of prepare_for_already_on_latest_unstable.
972972
if Edition::LATEST_UNSTABLE.is_some() {

tests/testsuite/lockfile_path.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ fn install_lock_file_path_must_present() {
494494
.run();
495495
}
496496

497-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
497+
#[cargo_test]
498498
fn run_embed() {
499499
let lockfile_path = "mylockfile/Cargo.lock";
500500
let invalid_lockfile = "Cargo.lock";

tests/testsuite/new.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ fn new_with_bad_edition() {
407407
.run();
408408
}
409409

410-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
410+
#[cargo_test]
411411
fn lockfile_constant_during_new() {
412412
cargo_process("new foo").run();
413413

tests/testsuite/script.rs

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fn path() -> Vec<std::path::PathBuf> {
2525
std::env::split_paths(&std::env::var_os("PATH").unwrap_or_default()).collect()
2626
}
2727

28-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
28+
#[cargo_test]
2929
fn basic_rs() {
3030
let p = cargo_test_support::project()
3131
.file("echo.rs", ECHO_SCRIPT)
@@ -48,7 +48,7 @@ args: []
4848
.run();
4949
}
5050

51-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
51+
#[cargo_test]
5252
fn basic_path() {
5353
let p = cargo_test_support::project()
5454
.file("echo", ECHO_SCRIPT)
@@ -94,8 +94,8 @@ fn path_required() {
9494
.run();
9595
}
9696

97-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
9897
#[cfg(unix)]
98+
#[cargo_test]
9999
fn manifest_precedence_over_plugins() {
100100
let p = cargo_test_support::project()
101101
.file("echo.rs", ECHO_SCRIPT)
@@ -125,8 +125,8 @@ args: []
125125
.run();
126126
}
127127

128-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
129128
#[cfg(unix)]
129+
#[cargo_test]
130130
fn warn_when_plugin_masks_manifest_on_stable() {
131131
let p = cargo_test_support::project()
132132
.file("echo.rs", ECHO_SCRIPT)
@@ -182,7 +182,7 @@ fn requires_z_flag() {
182182
.run();
183183
}
184184

185-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
185+
#[cargo_test]
186186
fn clean_output_with_edition() {
187187
let script = r#"#!/usr/bin/env cargo
188188
---
@@ -212,7 +212,7 @@ Hello world!
212212
.run();
213213
}
214214

215-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
215+
#[cargo_test]
216216
fn warning_without_edition() {
217217
let script = r#"#!/usr/bin/env cargo
218218
---
@@ -242,7 +242,7 @@ Hello world!
242242
.run();
243243
}
244244

245-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
245+
#[cargo_test]
246246
fn rebuild() {
247247
let script = r#"#!/usr/bin/env cargo-eval
248248
@@ -302,7 +302,7 @@ msg = hello
302302
.run();
303303
}
304304

305-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
305+
#[cargo_test]
306306
fn use_cargo_home_config() {
307307
let script = ECHO_SCRIPT;
308308
let _ = cargo_test_support::project()
@@ -366,7 +366,7 @@ Caused by:
366366
.run();
367367
}
368368

369-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
369+
#[cargo_test]
370370
fn default_programmatic_verbosity() {
371371
let script = ECHO_SCRIPT;
372372
let p = cargo_test_support::project()
@@ -384,7 +384,7 @@ args: ["-NotAnArg"]
384384
.run();
385385
}
386386

387-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
387+
#[cargo_test]
388388
fn quiet() {
389389
let script = ECHO_SCRIPT;
390390
let p = cargo_test_support::project()
@@ -402,7 +402,7 @@ args: ["-NotAnArg"]
402402
.run();
403403
}
404404

405-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
405+
#[cargo_test]
406406
fn test_line_numbering_preserved() {
407407
let script = r#"#!/usr/bin/env cargo
408408
@@ -430,7 +430,7 @@ line: 4
430430
.run();
431431
}
432432

433-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
433+
#[cargo_test]
434434
fn test_escaped_hyphen_arg() {
435435
let script = ECHO_SCRIPT;
436436
let p = cargo_test_support::project()
@@ -454,7 +454,7 @@ args: ["-NotAnArg"]
454454
.run();
455455
}
456456

457-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
457+
#[cargo_test]
458458
fn test_unescaped_hyphen_arg() {
459459
let script = ECHO_SCRIPT;
460460
let p = cargo_test_support::project()
@@ -478,7 +478,7 @@ args: ["-NotAnArg"]
478478
.run();
479479
}
480480

481-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
481+
#[cargo_test]
482482
fn test_same_flags() {
483483
let script = ECHO_SCRIPT;
484484
let p = cargo_test_support::project()
@@ -502,7 +502,7 @@ args: ["--help"]
502502
.run();
503503
}
504504

505-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
505+
#[cargo_test]
506506
fn test_name_has_weird_chars() {
507507
let script = ECHO_SCRIPT;
508508
let p = cargo_test_support::project()
@@ -526,7 +526,7 @@ args: []
526526
.run();
527527
}
528528

529-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
529+
#[cargo_test]
530530
fn test_name_has_leading_number() {
531531
let script = ECHO_SCRIPT;
532532
let p = cargo_test_support::project()
@@ -550,7 +550,7 @@ args: []
550550
.run();
551551
}
552552

553-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
553+
#[cargo_test]
554554
fn test_name_is_number() {
555555
let script = ECHO_SCRIPT;
556556
let p = cargo_test_support::project().file("42.rs", script).build();
@@ -685,7 +685,7 @@ fn did_you_mean_command_stable() {
685685
.run();
686686
}
687687

688-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
688+
#[cargo_test]
689689
fn test_name_same_as_dependency() {
690690
Package::new("script", "1.0.0").publish();
691691
let script = r#"#!/usr/bin/env cargo
@@ -722,7 +722,7 @@ Hello world!
722722
.run();
723723
}
724724

725-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
725+
#[cargo_test]
726726
fn test_path_dep() {
727727
let script = r#"#!/usr/bin/env cargo
728728
---
@@ -758,7 +758,7 @@ Hello world!
758758
.run();
759759
}
760760

761-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
761+
#[cargo_test]
762762
fn test_no_build_rs() {
763763
let script = r#"#!/usr/bin/env cargo
764764
@@ -786,7 +786,7 @@ Hello world!
786786
.run();
787787
}
788788

789-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
789+
#[cargo_test]
790790
fn test_no_autobins() {
791791
let script = r#"#!/usr/bin/env cargo
792792
@@ -814,7 +814,7 @@ Hello world!
814814
.run();
815815
}
816816

817-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
817+
#[cargo_test]
818818
fn test_no_autolib() {
819819
let script = r#"#!/usr/bin/env cargo
820820
@@ -1242,7 +1242,7 @@ Caused by:
12421242
.run();
12431243
}
12441244

1245-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
1245+
#[cargo_test]
12461246
fn implicit_target_dir() {
12471247
let script = ECHO_SCRIPT;
12481248
let p = cargo_test_support::project()
@@ -1266,7 +1266,7 @@ args: []
12661266
.run();
12671267
}
12681268

1269-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
1269+
#[cargo_test]
12701270
fn no_local_lockfile() {
12711271
let script = ECHO_SCRIPT;
12721272
let p = cargo_test_support::project()
@@ -1330,7 +1330,7 @@ fn cmd_check_requires_z_flag() {
13301330
.run();
13311331
}
13321332

1333-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
1333+
#[cargo_test]
13341334
fn cmd_check_with_embedded() {
13351335
let script = ECHO_SCRIPT;
13361336
let p = cargo_test_support::project()
@@ -1379,7 +1379,7 @@ fn cmd_check_with_missing_script() {
13791379
.run();
13801380
}
13811381

1382-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
1382+
#[cargo_test]
13831383
fn cmd_build_with_embedded() {
13841384
let script = ECHO_SCRIPT;
13851385
let p = cargo_test_support::project()
@@ -1398,7 +1398,7 @@ fn cmd_build_with_embedded() {
13981398
.run();
13991399
}
14001400

1401-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
1401+
#[cargo_test]
14021402
fn cmd_test_with_embedded() {
14031403
let script = ECHO_SCRIPT;
14041404
let p = cargo_test_support::project()
@@ -1426,7 +1426,7 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini
14261426
.run();
14271427
}
14281428

1429-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
1429+
#[cargo_test]
14301430
fn cmd_clean_with_embedded() {
14311431
let script = ECHO_SCRIPT;
14321432
let p = cargo_test_support::project()
@@ -1615,7 +1615,7 @@ fn cmd_read_manifest_with_embedded() {
16151615
.run();
16161616
}
16171617

1618-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
1618+
#[cargo_test]
16191619
fn cmd_run_with_embedded() {
16201620
let p = cargo_test_support::project()
16211621
.file("script.rs", ECHO_SCRIPT)
@@ -1696,7 +1696,7 @@ fn cmd_verify_project_with_embedded() {
16961696
.run();
16971697
}
16981698

1699-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
1699+
#[cargo_test]
17001700
fn cmd_pkgid_with_embedded() {
17011701
let p = cargo_test_support::project()
17021702
.file("script.rs", ECHO_SCRIPT)
@@ -1736,7 +1736,7 @@ fn cmd_pkgid_with_embedded_no_lock_file() {
17361736
.run();
17371737
}
17381738

1739-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
1739+
#[cargo_test]
17401740
fn cmd_pkgid_with_embedded_dep() {
17411741
Package::new("dep", "1.0.0").publish();
17421742
let script = r#"#!/usr/bin/env cargo
@@ -1769,7 +1769,7 @@ registry+https://github.com/rust-lang/crates.io-index#[email protected]
17691769
.run();
17701770
}
17711771

1772-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
1772+
#[cargo_test]
17731773
fn script_as_dep() {
17741774
let p = cargo_test_support::project()
17751775
.file("script.rs", ECHO_SCRIPT)
@@ -1857,7 +1857,7 @@ fn cmd_publish_with_embedded() {
18571857
.run();
18581858
}
18591859

1860-
#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
1860+
#[cargo_test]
18611861
fn manifest_path_env() {
18621862
let p = cargo_test_support::project()
18631863
.file(

0 commit comments

Comments
 (0)