Skip to content

Commit

Permalink
Bump to 0.51.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ehuss committed Nov 24, 2020
1 parent 41c0f48 commit 9b590d0
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 24 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cargo"
version = "0.50.0"
version = "0.51.0"
edition = "2018"
authors = ["Yehuda Katz <wycats@gmail.com>",
"Carl Lerche <me@carllerche.com>",
Expand Down
6 changes: 3 additions & 3 deletions tests/testsuite/dep_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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() {
Expand Down
12 changes: 0 additions & 12 deletions tests/testsuite/doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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")
Expand All @@ -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)
Expand Down
10 changes: 2 additions & 8 deletions tests/testsuite/profiles.rs
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,7 @@ fn thin_lto_works() {
#[cfg_attr(target_os = "macos", ignore)]
fn strip_works() {
if !is_nightly() {
// -Zstrip is unstable
return;
}

Expand Down Expand Up @@ -508,10 +509,6 @@ fn strip_works() {

#[cargo_test]
fn strip_requires_cargo_feature() {
if !is_nightly() {
return;
}

let p = project()
.file(
"Cargo.toml",
Expand Down Expand Up @@ -542,12 +539,9 @@ Caused by:
)
.run();
}

#[cargo_test]
fn strip_rejects_invalid_option() {
if !is_nightly() {
return;
}

let p = project()
.file(
"Cargo.toml",
Expand Down
2 changes: 2 additions & 0 deletions tests/testsuite/pub_priv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down
3 changes: 3 additions & 0 deletions tests/testsuite/required_features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@ fn test_multiple_required_features() {
#[cargo_test]
fn bench_default_features() {
if !is_nightly() {
// #[bench] is unstable
return;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -536,6 +538,7 @@ fn bench_arg_features() {
#[cargo_test]
fn bench_multiple_required_features() {
if !is_nightly() {
// #[bench] is unstable
return;
}

Expand Down

0 comments on commit 9b590d0

Please sign in to comment.