Skip to content

Commit f911dfd

Browse files
committed
Auto merge of #14088 - weihanglo:cleanup-1.79, r=ehuss
refactor: 1.79 cleanup
2 parents 06daef6 + f498582 commit f911dfd

File tree

6 files changed

+34
-38
lines changed

6 files changed

+34
-38
lines changed

Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ cargo-credential-libsecret = { version = "0.4.7", path = "credential/cargo-crede
3030
cargo-credential-macos-keychain = { version = "0.4.7", path = "credential/cargo-credential-macos-keychain" }
3131
cargo-credential-wincred = { version = "0.4.7", path = "credential/cargo-credential-wincred" }
3232
cargo-platform = { path = "crates/cargo-platform", version = "0.1.5" }
33-
cargo-test-macro = { version = "0.2.2", path = "crates/cargo-test-macro" }
34-
cargo-test-support = { version = "0.2.0", path = "crates/cargo-test-support" }
33+
cargo-test-macro = { version = "0.3.0", path = "crates/cargo-test-macro" }
34+
cargo-test-support = { version = "0.3.0", path = "crates/cargo-test-support" }
3535
cargo-util = { version = "0.2.14", path = "crates/cargo-util" }
3636
cargo-util-schemas = { version = "0.5.0", path = "crates/cargo-util-schemas" }
3737
cargo_metadata = "0.18.1"

crates/cargo-test-macro/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cargo-test-macro"
3-
version = "0.2.2"
3+
version = "0.3.0"
44
edition.workspace = true
55
rust-version = "1.79" # MSRV:1
66
license.workspace = true

crates/cargo-test-support/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cargo-test-support"
3-
version = "0.2.2"
3+
version = "0.3.0"
44
edition.workspace = true
55
rust-version = "1.79" # MSRV:1
66
license.workspace = true

crates/xtask-bump-check/src/xtask.rs

-4
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,6 @@ fn bump_check(args: &clap::ArgMatches, gctx: &cargo::util::GlobalContext) -> Car
176176
let mut cmd = ProcessBuilder::new("cargo");
177177
cmd.arg("semver-checks")
178178
.arg("check-release")
179-
.args(&["--exclude", "cargo-test-macro"]) // FIXME: Remove once 1.79 is stable.
180-
.args(&["--exclude", "cargo-test-support"]) // FIXME: Remove once 1.79 is stable.
181179
.arg("--workspace");
182180
gctx.shell().status("Running", &cmd)?;
183181
cmd.exec()?;
@@ -186,8 +184,6 @@ fn bump_check(args: &clap::ArgMatches, gctx: &cargo::util::GlobalContext) -> Car
186184
let mut cmd = ProcessBuilder::new("cargo");
187185
cmd.arg("semver-checks")
188186
.arg("--workspace")
189-
.args(&["--exclude", "cargo-test-macro"]) // FIXME: Remove once 1.79 is stable.
190-
.args(&["--exclude", "cargo-test-support"]) // FIXME: Remove once 1.79 is stable.
191187
.arg("--baseline-rev")
192188
.arg(referenced_commit.id().to_string());
193189
for krate in crates_not_check_against_channels {

tests/testsuite/check_cfg.rs

+28-28
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ macro_rules! x {
3131
}};
3232
}
3333

34-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
34+
#[cargo_test]
3535
fn features() {
3636
let p = project()
3737
.file(
@@ -57,7 +57,7 @@ fn features() {
5757
.run();
5858
}
5959

60-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
60+
#[cargo_test]
6161
fn features_with_deps() {
6262
let p = project()
6363
.file(
@@ -87,7 +87,7 @@ fn features_with_deps() {
8787
.run();
8888
}
8989

90-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
90+
#[cargo_test]
9191
fn features_with_opt_deps() {
9292
let p = project()
9393
.file(
@@ -118,7 +118,7 @@ fn features_with_opt_deps() {
118118
.run();
119119
}
120120

121-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
121+
#[cargo_test]
122122
fn features_with_namespaced_features() {
123123
let p = project()
124124
.file(
@@ -148,7 +148,7 @@ fn features_with_namespaced_features() {
148148
.run();
149149
}
150150

151-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
151+
#[cargo_test]
152152
fn features_fingerprint() {
153153
let p = project()
154154
.file(
@@ -218,7 +218,7 @@ fn features_fingerprint() {
218218
.run();
219219
}
220220

221-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
221+
#[cargo_test]
222222
fn well_known_names_values() {
223223
let p = project()
224224
.file("Cargo.toml", &basic_manifest("foo", "0.1.0"))
@@ -231,7 +231,7 @@ fn well_known_names_values() {
231231
.run();
232232
}
233233

234-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
234+
#[cargo_test]
235235
fn features_test() {
236236
let p = project()
237237
.file(
@@ -256,7 +256,7 @@ fn features_test() {
256256
.run();
257257
}
258258

259-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
259+
#[cargo_test]
260260
fn features_doctest() {
261261
let p = project()
262262
.file(
@@ -285,7 +285,7 @@ fn features_doctest() {
285285
.run();
286286
}
287287

288-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
288+
#[cargo_test]
289289
fn well_known_names_values_test() {
290290
let p = project()
291291
.file("Cargo.toml", &basic_manifest("foo", "0.1.0"))
@@ -298,7 +298,7 @@ fn well_known_names_values_test() {
298298
.run();
299299
}
300300

301-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
301+
#[cargo_test]
302302
fn well_known_names_values_doctest() {
303303
let p = project()
304304
.file("Cargo.toml", &basic_manifest("foo", "0.1.0"))
@@ -313,7 +313,7 @@ fn well_known_names_values_doctest() {
313313
.run();
314314
}
315315

316-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
316+
#[cargo_test]
317317
fn features_doc() {
318318
let p = project()
319319
.file(
@@ -340,7 +340,7 @@ fn features_doc() {
340340
.run();
341341
}
342342

343-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
343+
#[cargo_test]
344344
fn build_script_feedback() {
345345
let p = project()
346346
.file(
@@ -368,7 +368,7 @@ fn build_script_feedback() {
368368
.run();
369369
}
370370

371-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
371+
#[cargo_test]
372372
fn build_script_doc() {
373373
let p = project()
374374
.file(
@@ -406,7 +406,7 @@ fn build_script_doc() {
406406
.run();
407407
}
408408

409-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
409+
#[cargo_test]
410410
fn build_script_override() {
411411
let target = cargo_test_support::rustc_host();
412412

@@ -444,7 +444,7 @@ fn build_script_override() {
444444
.run();
445445
}
446446

447-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
447+
#[cargo_test]
448448
fn build_script_test() {
449449
let p = project()
450450
.file(
@@ -499,7 +499,7 @@ fn build_script_test() {
499499
.run();
500500
}
501501

502-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
502+
#[cargo_test]
503503
fn config_simple() {
504504
let p = project()
505505
.file(
@@ -524,7 +524,7 @@ fn config_simple() {
524524
.run();
525525
}
526526

527-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
527+
#[cargo_test]
528528
fn config_workspace() {
529529
let p = project()
530530
.file(
@@ -558,7 +558,7 @@ fn config_workspace() {
558558
.run();
559559
}
560560

561-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
561+
#[cargo_test]
562562
fn config_workspace_not_inherited() {
563563
let p = project()
564564
.file(
@@ -589,7 +589,7 @@ fn config_workspace_not_inherited() {
589589
.run();
590590
}
591591

592-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
592+
#[cargo_test]
593593
fn config_invalid_position() {
594594
let p = project()
595595
.file(
@@ -613,7 +613,7 @@ fn config_invalid_position() {
613613
.run();
614614
}
615615

616-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
616+
#[cargo_test]
617617
fn config_invalid_empty() {
618618
let p = project()
619619
.file(
@@ -637,7 +637,7 @@ fn config_invalid_empty() {
637637
.run();
638638
}
639639

640-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
640+
#[cargo_test]
641641
fn config_invalid_not_list() {
642642
let p = project()
643643
.file(
@@ -663,7 +663,7 @@ fn config_invalid_not_list() {
663663
.run();
664664
}
665665

666-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
666+
#[cargo_test]
667667
fn config_invalid_not_list_string() {
668668
let p = project()
669669
.file(
@@ -689,7 +689,7 @@ fn config_invalid_not_list_string() {
689689
.run();
690690
}
691691

692-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
692+
#[cargo_test]
693693
fn config_and_features() {
694694
let p = project()
695695
.file(
@@ -718,7 +718,7 @@ fn config_and_features() {
718718
.run();
719719
}
720720

721-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
721+
#[cargo_test]
722722
fn config_with_cargo_doc() {
723723
let p = project()
724724
.file(
@@ -741,7 +741,7 @@ fn config_with_cargo_doc() {
741741
.run();
742742
}
743743

744-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
744+
#[cargo_test]
745745
fn config_with_cargo_test() {
746746
let p = project()
747747
.file(
@@ -764,7 +764,7 @@ fn config_with_cargo_test() {
764764
.run();
765765
}
766766

767-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
767+
#[cargo_test]
768768
fn config_and_build_script() {
769769
let p = project()
770770
.file(
@@ -793,7 +793,7 @@ fn config_and_build_script() {
793793
.run();
794794
}
795795

796-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
796+
#[cargo_test]
797797
fn config_features_and_build_script() {
798798
let p = project()
799799
.file(
@@ -828,7 +828,7 @@ fn config_features_and_build_script() {
828828
.run();
829829
}
830830

831-
#[cargo_test(>=1.79, reason = "--check-cfg was stabilized in Rust 1.79")]
831+
#[cargo_test]
832832
fn config_fingerprint() {
833833
let p = project()
834834
.file(

0 commit comments

Comments
 (0)