From 1185249ff0189a38a82961c81689f4c9381c841b Mon Sep 17 00:00:00 2001 From: Weihang Lo <me@weihanglo.tw> Date: Tue, 11 Jun 2024 16:38:21 -0400 Subject: [PATCH 1/3] test: `--check-cfg` is stabilized in rustc 1.79.0 --- tests/testsuite/check_cfg.rs | 56 ++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/tests/testsuite/check_cfg.rs b/tests/testsuite/check_cfg.rs index a1de4e91d96..d25e8bf740d 100644 --- a/tests/testsuite/check_cfg.rs +++ b/tests/testsuite/check_cfg.rs @@ -31,7 +31,7 @@ macro_rules! x { }}; } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn features() { let p = project() .file( @@ -57,7 +57,7 @@ fn features() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn features_with_deps() { let p = project() .file( @@ -87,7 +87,7 @@ fn features_with_deps() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn features_with_opt_deps() { let p = project() .file( @@ -118,7 +118,7 @@ fn features_with_opt_deps() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn features_with_namespaced_features() { let p = project() .file( @@ -148,7 +148,7 @@ fn features_with_namespaced_features() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn features_fingerprint() { let p = project() .file( @@ -218,7 +218,7 @@ fn features_fingerprint() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn well_known_names_values() { let p = project() .file("Cargo.toml", &basic_manifest("foo", "0.1.0")) @@ -231,7 +231,7 @@ fn well_known_names_values() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn features_test() { let p = project() .file( @@ -256,7 +256,7 @@ fn features_test() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn features_doctest() { let p = project() .file( @@ -285,7 +285,7 @@ fn features_doctest() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn well_known_names_values_test() { let p = project() .file("Cargo.toml", &basic_manifest("foo", "0.1.0")) @@ -298,7 +298,7 @@ fn well_known_names_values_test() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn well_known_names_values_doctest() { let p = project() .file("Cargo.toml", &basic_manifest("foo", "0.1.0")) @@ -313,7 +313,7 @@ fn well_known_names_values_doctest() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn features_doc() { let p = project() .file( @@ -340,7 +340,7 @@ fn features_doc() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn build_script_feedback() { let p = project() .file( @@ -368,7 +368,7 @@ fn build_script_feedback() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn build_script_doc() { let p = project() .file( @@ -406,7 +406,7 @@ fn build_script_doc() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn build_script_override() { let target = cargo_test_support::rustc_host(); @@ -444,7 +444,7 @@ fn build_script_override() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn build_script_test() { let p = project() .file( @@ -499,7 +499,7 @@ fn build_script_test() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn config_simple() { let p = project() .file( @@ -524,7 +524,7 @@ fn config_simple() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn config_workspace() { let p = project() .file( @@ -558,7 +558,7 @@ fn config_workspace() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn config_workspace_not_inherited() { let p = project() .file( @@ -589,7 +589,7 @@ fn config_workspace_not_inherited() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn config_invalid_position() { let p = project() .file( @@ -613,7 +613,7 @@ fn config_invalid_position() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn config_invalid_empty() { let p = project() .file( @@ -637,7 +637,7 @@ fn config_invalid_empty() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn config_invalid_not_list() { let p = project() .file( @@ -663,7 +663,7 @@ fn config_invalid_not_list() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn config_invalid_not_list_string() { let p = project() .file( @@ -689,7 +689,7 @@ fn config_invalid_not_list_string() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn config_and_features() { let p = project() .file( @@ -718,7 +718,7 @@ fn config_and_features() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn config_with_cargo_doc() { let p = project() .file( @@ -741,7 +741,7 @@ fn config_with_cargo_doc() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn config_with_cargo_test() { let p = project() .file( @@ -764,7 +764,7 @@ fn config_with_cargo_test() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn config_and_build_script() { let p = project() .file( @@ -793,7 +793,7 @@ fn config_and_build_script() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn config_features_and_build_script() { let p = project() .file( @@ -828,7 +828,7 @@ fn config_features_and_build_script() { .run(); } -#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")] +#[cargo_test] fn config_fingerprint() { let p = project() .file( From 80980d984a19ab192ebfb0d6f06cee726f8e170d Mon Sep 17 00:00:00 2001 From: Weihang Lo <me@weihanglo.tw> Date: Tue, 11 Jun 2024 16:33:59 -0400 Subject: [PATCH 2/3] chore(bump-check): `cargo-test-{support,macro}` on crates.io --- crates/xtask-bump-check/src/xtask.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/crates/xtask-bump-check/src/xtask.rs b/crates/xtask-bump-check/src/xtask.rs index e602d5df3a7..1b131383dad 100644 --- a/crates/xtask-bump-check/src/xtask.rs +++ b/crates/xtask-bump-check/src/xtask.rs @@ -176,8 +176,6 @@ fn bump_check(args: &clap::ArgMatches, gctx: &cargo::util::GlobalContext) -> Car let mut cmd = ProcessBuilder::new("cargo"); cmd.arg("semver-checks") .arg("check-release") - .args(&["--exclude", "cargo-test-macro"]) // FIXME: Remove once 1.79 is stable. - .args(&["--exclude", "cargo-test-support"]) // FIXME: Remove once 1.79 is stable. .arg("--workspace"); gctx.shell().status("Running", &cmd)?; cmd.exec()?; @@ -186,8 +184,6 @@ fn bump_check(args: &clap::ArgMatches, gctx: &cargo::util::GlobalContext) -> Car let mut cmd = ProcessBuilder::new("cargo"); cmd.arg("semver-checks") .arg("--workspace") - .args(&["--exclude", "cargo-test-macro"]) // FIXME: Remove once 1.79 is stable. - .args(&["--exclude", "cargo-test-support"]) // FIXME: Remove once 1.79 is stable. .arg("--baseline-rev") .arg(referenced_commit.id().to_string()); for krate in crates_not_check_against_channels { From f4985827d7d6dbdeccf98a721e7a6b4c2c75565c Mon Sep 17 00:00:00 2001 From: Weihang Lo <me@weihanglo.tw> Date: Mon, 17 Jun 2024 10:05:39 -0400 Subject: [PATCH 3/3] chore: bump `cargo-test-{support,macro}` due to public API changes --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- crates/cargo-test-macro/Cargo.toml | 2 +- crates/cargo-test-support/Cargo.toml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2366615cd27..48574a00e32 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -409,11 +409,11 @@ dependencies = [ [[package]] name = "cargo-test-macro" -version = "0.2.2" +version = "0.3.0" [[package]] name = "cargo-test-support" -version = "0.2.2" +version = "0.3.0" dependencies = [ "anstream", "anstyle", diff --git a/Cargo.toml b/Cargo.toml index 7eade240b29..ac4c3924efe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,8 +30,8 @@ cargo-credential-libsecret = { version = "0.4.7", path = "credential/cargo-crede cargo-credential-macos-keychain = { version = "0.4.7", path = "credential/cargo-credential-macos-keychain" } cargo-credential-wincred = { version = "0.4.7", path = "credential/cargo-credential-wincred" } cargo-platform = { path = "crates/cargo-platform", version = "0.1.5" } -cargo-test-macro = { version = "0.2.2", path = "crates/cargo-test-macro" } -cargo-test-support = { version = "0.2.0", path = "crates/cargo-test-support" } +cargo-test-macro = { version = "0.3.0", path = "crates/cargo-test-macro" } +cargo-test-support = { version = "0.3.0", path = "crates/cargo-test-support" } cargo-util = { version = "0.2.14", path = "crates/cargo-util" } cargo-util-schemas = { version = "0.5.0", path = "crates/cargo-util-schemas" } cargo_metadata = "0.18.1" diff --git a/crates/cargo-test-macro/Cargo.toml b/crates/cargo-test-macro/Cargo.toml index 79d2afeb508..59d993112ae 100644 --- a/crates/cargo-test-macro/Cargo.toml +++ b/crates/cargo-test-macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-test-macro" -version = "0.2.2" +version = "0.3.0" edition.workspace = true rust-version = "1.79" # MSRV:1 license.workspace = true diff --git a/crates/cargo-test-support/Cargo.toml b/crates/cargo-test-support/Cargo.toml index aaf2490715a..f6e1ffa2d39 100644 --- a/crates/cargo-test-support/Cargo.toml +++ b/crates/cargo-test-support/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-test-support" -version = "0.2.2" +version = "0.3.0" edition.workspace = true rust-version = "1.79" # MSRV:1 license.workspace = true