Skip to content

Commit 1cd7e38

Browse files
committed
Auto merge of #8894 - ehuss:version-bump, r=Eh2406
Bump to 0.51.0, update changelog
2 parents 774c64c + 675fb9f commit 1cd7e38

File tree

7 files changed

+77
-26
lines changed

7 files changed

+77
-26
lines changed

CHANGELOG.md

Lines changed: 66 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,86 @@
11
# Changelog
22

3+
## Cargo 1.50 (2021-02-11)
4+
[8662ab42...HEAD](https://github.com/rust-lang/cargo/compare/8662ab42...HEAD)
5+
6+
### Added
7+
- Added the `doc` field to `cargo metadata`, which indicates if a target is
8+
documented.
9+
[#8869](https://github.com/rust-lang/cargo/pull/8869)
10+
11+
### Changed
12+
- `.crate` files uploaded to a registry are now built with reproducible
13+
settings, so that the same `.crate` file created on different machines
14+
should be identical.
15+
[#8864](https://github.com/rust-lang/cargo/pull/8864)
16+
17+
### Fixed
18+
19+
### Nightly only
20+
- Allow `resolver="1"` to specify the original feature resolution behavior.
21+
[#8857](https://github.com/rust-lang/cargo/pull/8857)
22+
- Added `-Z extra-link-arg` which adds the `cargo:rustc-link-arg-bins`
23+
and `cargo:rustc-link-arg` build script options.
24+
[docs](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#extra-link-arg)
25+
[#8441](https://github.com/rust-lang/cargo/pull/8441)
26+
327
## Cargo 1.49 (2020-12-31)
4-
[75615f8e...HEAD](https://github.com/rust-lang/cargo/compare/75615f8e...HEAD)
28+
[75615f8e...rust-1.49.0](https://github.com/rust-lang/cargo/compare/75615f8e...rust-1.49.0)
529

630
### Added
731
- Added `homepage` and `documentation` fields to `cargo metadata`.
832
[#8744](https://github.com/rust-lang/cargo/pull/8744)
33+
- Added the `CARGO_PRIMARY_PACKAGE` environment variable which is set when
34+
running `rustc` if the package is one of the "root" packages selected on the
35+
command line.
36+
[#8758](https://github.com/rust-lang/cargo/pull/8758)
37+
- Added support for Unix-style glob patterns for package and target selection
38+
flags on the command-line (such as `-p 'serde*'` or `--test '*'`).
39+
[#8752](https://github.com/rust-lang/cargo/pull/8752)
940

1041
### Changed
1142
- Computed LTO flags are now included in the filename metadata hash so that
1243
changes in LTO settings will independently cache build artifacts instead of
1344
overwriting previous ones. This prevents rebuilds in some situations such as
1445
switching between `cargo build` and `cargo test` in some circumstances.
1546
[#8755](https://github.com/rust-lang/cargo/pull/8755)
47+
- `cargo tree` now displays `(proc-macro)` next to proc-macro packages.
48+
[#8765](https://github.com/rust-lang/cargo/pull/8765)
49+
- Added a warning that the allowed characters for a feature name have been
50+
restricted to letters, digits, `_`, `-`, and `+` to accommodate future
51+
syntax changes. This is still a superset of the allowed syntax on crates.io,
52+
which requires ASCII. This is intended to be changed to an error in the
53+
future.
54+
[#8814](https://github.com/rust-lang/cargo/pull/8814)
55+
- `-p` without a value will now print a list of workspace package names.
56+
[#8808](https://github.com/rust-lang/cargo/pull/8808)
1657

1758
### Fixed
1859
- Fixed building a library with both "dylib" and "rlib" crate types with LTO enabled.
1960
[#8754](https://github.com/rust-lang/cargo/pull/8754)
61+
- Fixed paths in Cargo's dep-info files.
62+
[#8819](https://github.com/rust-lang/cargo/pull/8819)
63+
- Fixed inconsistent source IDs in `cargo metadata` for git dependencies that
64+
explicitly specify `branch="master"`.
65+
[#8824](https://github.com/rust-lang/cargo/pull/8824)
66+
- Fixed re-extracting dependencies which contained a `.cargo-ok` file.
67+
[#8835](https://github.com/rust-lang/cargo/pull/8835)
2068

2169
### Nightly only
22-
70+
- Fixed a panic with `cargo doc -Zfeatures=itarget` in some situations.
71+
[#8777](https://github.com/rust-lang/cargo/pull/8777)
72+
- New implementation for namespaced features, using the syntax `dep:serde`.
73+
[docs](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#namespaced-features)
74+
[#8799](https://github.com/rust-lang/cargo/pull/8799)
75+
- Added support for "weak" dependency features, using the syntax
76+
`dep_name?/feat_name`, which will enable a feature for a dependency without
77+
also enabling the dependency.
78+
[#8818](https://github.com/rust-lang/cargo/pull/8818)
79+
- Fixed the new feature resolver downloading extra dependencies that weren't
80+
strictly necessary.
81+
[#8823](https://github.com/rust-lang/cargo/pull/8823)
82+
- Vendored builds now work with `-Zbuild-std`.
83+
[#8834](https://github.com/rust-lang/cargo/pull/8834)
2384

2485
## Cargo 1.48 (2020-11-19)
2586
[51b66125...rust-1.48.0](https://github.com/rust-lang/cargo/compare/51b66125...rust-1.48.0)
@@ -52,6 +113,9 @@
52113
- Automatically reinitialize the index when an "Object not found" error is
53114
encountered in the git repository.
54115
[#8735](https://github.com/rust-lang/cargo/pull/8735)
116+
- Updated libgit2, which brings in several fixes for git repository handling.
117+
[#8778](https://github.com/rust-lang/cargo/pull/8778)
118+
[#8780](https://github.com/rust-lang/cargo/pull/8780)
55119

56120
### Nightly only
57121
- Fixed `cargo install` so that it will ignore the `[unstable]` table in local config files.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "cargo"
3-
version = "0.50.0"
3+
version = "0.51.0"
44
edition = "2018"
55
authors = ["Yehuda Katz <wycats@gmail.com>",
66
"Carl Lerche <me@carllerche.com>",

tests/testsuite/dep_info.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ fn no_rewrite_if_no_change() {
230230
#[cargo_test]
231231
fn relative_depinfo_paths_ws() {
232232
if !is_nightly() {
233-
// See https://github.com/rust-lang/rust/issues/63012
233+
// -Z binary-dep-depinfo is unstable (https://github.com/rust-lang/rust/issues/63012)
234234
return;
235235
}
236236

@@ -368,7 +368,7 @@ fn relative_depinfo_paths_ws() {
368368
#[cargo_test]
369369
fn relative_depinfo_paths_no_ws() {
370370
if !is_nightly() {
371-
// See https://github.com/rust-lang/rust/issues/63012
371+
// -Z binary-dep-depinfo is unstable (https://github.com/rust-lang/rust/issues/63012)
372372
return;
373373
}
374374

@@ -535,7 +535,7 @@ fn reg_dep_source_not_tracked() {
535535
#[cargo_test]
536536
fn canonical_path() {
537537
if !is_nightly() {
538-
// See https://github.com/rust-lang/rust/issues/63012
538+
// -Z binary-dep-depinfo is unstable (https://github.com/rust-lang/rust/issues/63012)
539539
return;
540540
}
541541
if !cargo_test_support::symlink_supported() {

tests/testsuite/doc.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,10 +1352,6 @@ pub fn foo() {}
13521352

13531353
#[cargo_test]
13541354
fn doc_cap_lints() {
1355-
if !is_nightly() {
1356-
// This can be removed once intra_doc_link_resolution_failure fails on stable.
1357-
return;
1358-
}
13591355
let a = git::new("a", |p| {
13601356
p.file("Cargo.toml", &basic_lib_manifest("a"))
13611357
.file("src/lib.rs", BAD_INTRA_LINK_LIB)
@@ -1401,10 +1397,6 @@ fn doc_cap_lints() {
14011397

14021398
#[cargo_test]
14031399
fn doc_message_format() {
1404-
if !is_nightly() {
1405-
// This can be removed once intra_doc_link_resolution_failure fails on stable.
1406-
return;
1407-
}
14081400
let p = project().file("src/lib.rs", BAD_INTRA_LINK_LIB).build();
14091401

14101402
p.cargo("doc --message-format=json")
@@ -1431,10 +1423,6 @@ fn doc_message_format() {
14311423

14321424
#[cargo_test]
14331425
fn short_message_format() {
1434-
if !is_nightly() {
1435-
// This can be removed once intra_doc_link_resolution_failure fails on stable.
1436-
return;
1437-
}
14381426
let p = project().file("src/lib.rs", BAD_INTRA_LINK_LIB).build();
14391427
p.cargo("doc --message-format=short")
14401428
.with_status(101)

tests/testsuite/profiles.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,7 @@ fn thin_lto_works() {
474474
#[cfg_attr(target_os = "macos", ignore)]
475475
fn strip_works() {
476476
if !is_nightly() {
477+
// -Zstrip is unstable
477478
return;
478479
}
479480

@@ -508,10 +509,6 @@ fn strip_works() {
508509

509510
#[cargo_test]
510511
fn strip_requires_cargo_feature() {
511-
if !is_nightly() {
512-
return;
513-
}
514-
515512
let p = project()
516513
.file(
517514
"Cargo.toml",
@@ -542,12 +539,9 @@ Caused by:
542539
)
543540
.run();
544541
}
542+
545543
#[cargo_test]
546544
fn strip_rejects_invalid_option() {
547-
if !is_nightly() {
548-
return;
549-
}
550-
551545
let p = project()
552546
.file(
553547
"Cargo.toml",

tests/testsuite/pub_priv.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use cargo_test_support::{is_nightly, project};
66
#[cargo_test]
77
fn exported_priv_warning() {
88
if !is_nightly() {
9+
// exported_private_dependencies lint is unstable
910
return;
1011
}
1112
Package::new("priv_dep", "0.1.0")
@@ -48,6 +49,7 @@ src/lib.rs:3:13: warning: type `[..]FromPriv` from private dependency 'priv_dep'
4849
#[cargo_test]
4950
fn exported_pub_dep() {
5051
if !is_nightly() {
52+
// exported_private_dependencies lint is unstable
5153
return;
5254
}
5355
Package::new("pub_dep", "0.1.0")

tests/testsuite/required_features.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,7 @@ fn test_multiple_required_features() {
417417
#[cargo_test]
418418
fn bench_default_features() {
419419
if !is_nightly() {
420+
// #[bench] is unstable
420421
return;
421422
}
422423

@@ -489,6 +490,7 @@ Consider enabling them by passing, e.g., `--features=\"a\"`
489490
#[cargo_test]
490491
fn bench_arg_features() {
491492
if !is_nightly() {
493+
// #[bench] is unstable
492494
return;
493495
}
494496

@@ -536,6 +538,7 @@ fn bench_arg_features() {
536538
#[cargo_test]
537539
fn bench_multiple_required_features() {
538540
if !is_nightly() {
541+
// #[bench] is unstable
539542
return;
540543
}
541544

0 commit comments

Comments
 (0)