From 9b590d0dd4468dea734042f4e96ca50eb3bf91ed Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Mon, 23 Nov 2020 17:34:18 -0800 Subject: [PATCH] Bump to 0.51.0 --- Cargo.toml | 2 +- tests/testsuite/dep_info.rs | 6 +++--- tests/testsuite/doc.rs | 12 ------------ tests/testsuite/profiles.rs | 10 ++-------- tests/testsuite/pub_priv.rs | 2 ++ tests/testsuite/required_features.rs | 3 +++ 6 files changed, 11 insertions(+), 24 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f1d1b61f2..bf322e16c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo" -version = "0.50.0" +version = "0.51.0" edition = "2018" authors = ["Yehuda Katz ", "Carl Lerche ", diff --git a/tests/testsuite/dep_info.rs b/tests/testsuite/dep_info.rs index d63d09652..cfa6e9652 100644 --- a/tests/testsuite/dep_info.rs +++ b/tests/testsuite/dep_info.rs @@ -230,7 +230,7 @@ fn no_rewrite_if_no_change() { #[cargo_test] fn relative_depinfo_paths_ws() { if !is_nightly() { - // See https://github.com/rust-lang/rust/issues/63012 + // -Z binary-dep-depinfo is unstable (https://github.com/rust-lang/rust/issues/63012) return; } @@ -368,7 +368,7 @@ fn relative_depinfo_paths_ws() { #[cargo_test] fn relative_depinfo_paths_no_ws() { if !is_nightly() { - // See https://github.com/rust-lang/rust/issues/63012 + // -Z binary-dep-depinfo is unstable (https://github.com/rust-lang/rust/issues/63012) return; } @@ -535,7 +535,7 @@ fn reg_dep_source_not_tracked() { #[cargo_test] fn canonical_path() { if !is_nightly() { - // See https://github.com/rust-lang/rust/issues/63012 + // -Z binary-dep-depinfo is unstable (https://github.com/rust-lang/rust/issues/63012) return; } if !cargo_test_support::symlink_supported() { diff --git a/tests/testsuite/doc.rs b/tests/testsuite/doc.rs index 8b1749f5e..516e00702 100644 --- a/tests/testsuite/doc.rs +++ b/tests/testsuite/doc.rs @@ -1352,10 +1352,6 @@ pub fn foo() {} #[cargo_test] fn doc_cap_lints() { - if !is_nightly() { - // This can be removed once intra_doc_link_resolution_failure fails on stable. - return; - } let a = git::new("a", |p| { p.file("Cargo.toml", &basic_lib_manifest("a")) .file("src/lib.rs", BAD_INTRA_LINK_LIB) @@ -1401,10 +1397,6 @@ fn doc_cap_lints() { #[cargo_test] fn doc_message_format() { - if !is_nightly() { - // This can be removed once intra_doc_link_resolution_failure fails on stable. - return; - } let p = project().file("src/lib.rs", BAD_INTRA_LINK_LIB).build(); p.cargo("doc --message-format=json") @@ -1431,10 +1423,6 @@ fn doc_message_format() { #[cargo_test] fn short_message_format() { - if !is_nightly() { - // This can be removed once intra_doc_link_resolution_failure fails on stable. - return; - } let p = project().file("src/lib.rs", BAD_INTRA_LINK_LIB).build(); p.cargo("doc --message-format=short") .with_status(101) diff --git a/tests/testsuite/profiles.rs b/tests/testsuite/profiles.rs index de2b477fd..d238d9a63 100644 --- a/tests/testsuite/profiles.rs +++ b/tests/testsuite/profiles.rs @@ -474,6 +474,7 @@ fn thin_lto_works() { #[cfg_attr(target_os = "macos", ignore)] fn strip_works() { if !is_nightly() { + // -Zstrip is unstable return; } @@ -508,10 +509,6 @@ fn strip_works() { #[cargo_test] fn strip_requires_cargo_feature() { - if !is_nightly() { - return; - } - let p = project() .file( "Cargo.toml", @@ -542,12 +539,9 @@ Caused by: ) .run(); } + #[cargo_test] fn strip_rejects_invalid_option() { - if !is_nightly() { - return; - } - let p = project() .file( "Cargo.toml", diff --git a/tests/testsuite/pub_priv.rs b/tests/testsuite/pub_priv.rs index 17c583165..a10cb1ef0 100644 --- a/tests/testsuite/pub_priv.rs +++ b/tests/testsuite/pub_priv.rs @@ -6,6 +6,7 @@ use cargo_test_support::{is_nightly, project}; #[cargo_test] fn exported_priv_warning() { if !is_nightly() { + // exported_private_dependencies lint is unstable return; } Package::new("priv_dep", "0.1.0") @@ -48,6 +49,7 @@ src/lib.rs:3:13: warning: type `[..]FromPriv` from private dependency 'priv_dep' #[cargo_test] fn exported_pub_dep() { if !is_nightly() { + // exported_private_dependencies lint is unstable return; } Package::new("pub_dep", "0.1.0") diff --git a/tests/testsuite/required_features.rs b/tests/testsuite/required_features.rs index 5289c60b0..eabc9aaf2 100644 --- a/tests/testsuite/required_features.rs +++ b/tests/testsuite/required_features.rs @@ -417,6 +417,7 @@ fn test_multiple_required_features() { #[cargo_test] fn bench_default_features() { if !is_nightly() { + // #[bench] is unstable return; } @@ -489,6 +490,7 @@ Consider enabling them by passing, e.g., `--features=\"a\"` #[cargo_test] fn bench_arg_features() { if !is_nightly() { + // #[bench] is unstable return; } @@ -536,6 +538,7 @@ fn bench_arg_features() { #[cargo_test] fn bench_multiple_required_features() { if !is_nightly() { + // #[bench] is unstable return; } -- 2.39.5