Skip to content

test: Remove unused nightly requirements #15498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2025
Merged

test: Remove unused nightly requirements #15498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/testsuite/fix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@ fn prepare_for_already_on_latest_unstable() {
.run();
}

#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
#[cargo_test]
fn prepare_for_already_on_latest_stable() {
// Stable counterpart of prepare_for_already_on_latest_unstable.
if Edition::LATEST_UNSTABLE.is_some() {
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/lockfile_path.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ fn install_lock_file_path_must_present() {
.run();
}

#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
#[cargo_test]
fn run_embed() {
let lockfile_path = "mylockfile/Cargo.lock";
let invalid_lockfile = "Cargo.lock";
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/new.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ fn new_with_bad_edition() {
.run();
}

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

Expand Down
66 changes: 33 additions & 33 deletions tests/testsuite/script.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fn path() -> Vec<std::path::PathBuf> {
std::env::split_paths(&std::env::var_os("PATH").unwrap_or_default()).collect()
}

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

#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
#[cargo_test]
fn basic_path() {
let p = cargo_test_support::project()
.file("echo", ECHO_SCRIPT)
Expand Down Expand Up @@ -94,8 +94,8 @@ fn path_required() {
.run();
}

#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
#[cfg(unix)]
#[cargo_test]
fn manifest_precedence_over_plugins() {
let p = cargo_test_support::project()
.file("echo.rs", ECHO_SCRIPT)
Expand Down Expand Up @@ -125,8 +125,8 @@ args: []
.run();
}

#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
#[cfg(unix)]
#[cargo_test]
fn warn_when_plugin_masks_manifest_on_stable() {
let p = cargo_test_support::project()
.file("echo.rs", ECHO_SCRIPT)
Expand Down Expand Up @@ -182,7 +182,7 @@ fn requires_z_flag() {
.run();
}

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

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

#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
#[cargo_test]
fn rebuild() {
let script = r#"#!/usr/bin/env cargo-eval

Expand Down Expand Up @@ -302,7 +302,7 @@ msg = hello
.run();
}

#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
#[cargo_test]
fn use_cargo_home_config() {
let script = ECHO_SCRIPT;
let _ = cargo_test_support::project()
Expand Down Expand Up @@ -366,7 +366,7 @@ Caused by:
.run();
}

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

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

#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
#[cargo_test]
fn test_line_numbering_preserved() {
let script = r#"#!/usr/bin/env cargo

Expand Down Expand Up @@ -430,7 +430,7 @@ line: 4
.run();
}

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

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

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

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

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

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

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

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

#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
#[cargo_test]
fn test_no_build_rs() {
let script = r#"#!/usr/bin/env cargo

Expand Down Expand Up @@ -786,7 +786,7 @@ Hello world!
.run();
}

#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
#[cargo_test]
fn test_no_autobins() {
let script = r#"#!/usr/bin/env cargo

Expand Down Expand Up @@ -814,7 +814,7 @@ Hello world!
.run();
}

#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
#[cargo_test]
fn test_no_autolib() {
let script = r#"#!/usr/bin/env cargo

Expand Down Expand Up @@ -1242,7 +1242,7 @@ Caused by:
.run();
}

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

#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
#[cargo_test]
fn no_local_lockfile() {
let script = ECHO_SCRIPT;
let p = cargo_test_support::project()
Expand Down Expand Up @@ -1330,7 +1330,7 @@ fn cmd_check_requires_z_flag() {
.run();
}

#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
#[cargo_test]
fn cmd_check_with_embedded() {
let script = ECHO_SCRIPT;
let p = cargo_test_support::project()
Expand Down Expand Up @@ -1379,7 +1379,7 @@ fn cmd_check_with_missing_script() {
.run();
}

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

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

#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
#[cargo_test]
fn cmd_clean_with_embedded() {
let script = ECHO_SCRIPT;
let p = cargo_test_support::project()
Expand Down Expand Up @@ -1615,7 +1615,7 @@ fn cmd_read_manifest_with_embedded() {
.run();
}

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

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

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

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

#[cargo_test(nightly, reason = "edition2024 hasn't hit stable yet")]
#[cargo_test]
fn manifest_path_env() {
let p = cargo_test_support::project()
.file(
Expand Down