Skip to content
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

refactor: 1.79 cleanup #14088

Merged
merged 3 commits into from
Jun 17, 2024
Merged

refactor: 1.79 cleanup #14088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1185249
test: `--check-cfg` is stabilized in rustc 1.79.0
weihanglo Jun 11, 2024
80980d9
chore(bump-check): `cargo-test-{support,macro}` on crates.io
weihanglo Jun 11, 2024
f498582
chore: bump `cargo-test-{support,macro}` due to public API changes
weihanglo Jun 17, 2024
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
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion crates/cargo-test-macro/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion crates/cargo-test-support/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 0 additions & 4 deletions crates/xtask-bump-check/src/xtask.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()?;
Expand All @@ -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 {
Expand Down
56 changes: 28 additions & 28 deletions tests/testsuite/check_cfg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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"))
Expand All @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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"))
Expand All @@ -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"))
Expand All @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down