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.

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

Update verison to 0.42 #7568

Merged
merged 4 commits into from
Nov 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
74 changes: 72 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,78 @@
# Changelog

## Cargo 1.41 (2019-01-30)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2019 -> 2020

[5da4b4d4...HEAD](https://github.com/rust-lang/cargo/compare/5da4b4d4...HEAD)

### Added
### Changed
### Fixed

## Cargo 1.40 (2019-12-19)
[4b105b6a...HEAD](https://github.com/rust-lang/cargo/compare/4b105b6a...HEAD)
[1c6ec66d...rust-1.40.0](https://github.com/rust-lang/cargo/compare/1c6ec66d...rust-1.40.0)

### Added
- (Nightly only): The `mtime-on-use` feature may now be enabled via the
`unstable.mtime_on_use` config option.
[#7411](https://github.com/rust-lang/cargo/pull/7411)
- Added `http.ssl-version` config option to control the version of TLS,
along with min/max versions.
[#7308](https://github.com/rust-lang/cargo/pull/7308)
- (Nightly only): Added support for named profiles.
[#6989](https://github.com/rust-lang/cargo/pull/6989)
- 🔥 Compiler warnings are now cached on disk. If a build generates warnings,
re-running the build will now re-display the warnings.
[#7450](https://github.com/rust-lang/cargo/pull/7450)
- (Nightly only): Added `-Zpanic-abort-tests` to allow building and running
tests with the "abort" panic strategy.
[#7460](https://github.com/rust-lang/cargo/pull/7460)
- Added `--filter-platform` option to `cargo metadata` to narrow the nodes
shown in the resolver graph to only packages included for the given target
triple.
[#7376](https://github.com/rust-lang/cargo/pull/7376)

### Changed
- Cargo's "platform" `cfg` parsing has been extracted into a separate crate
named `cargo-platform`.
[#7375](https://github.com/rust-lang/cargo/pull/7375)
- (Nightly only): Changed `build-std` to use `--sysroot`.
[#7421](https://github.com/rust-lang/cargo/pull/7421)
- (Nightly only): Various fixes and enhancements to `-Ztimings`.
[#7395](https://github.com/rust-lang/cargo/pull/7395)
[#7398](https://github.com/rust-lang/cargo/pull/7398)
[#7397](https://github.com/rust-lang/cargo/pull/7397)
[#7403](https://github.com/rust-lang/cargo/pull/7403)
[#7428](https://github.com/rust-lang/cargo/pull/7428)
[#7429](https://github.com/rust-lang/cargo/pull/7429)
- Dependencies extracted into Cargo's cache no longer preserve mtimes to
reduce syscall overhead.
[#7465](https://github.com/rust-lang/cargo/pull/7465)
- Windows: EXE files no longer include a metadata hash in the filename.
This helps with debuggers correlating the filename with the PDB file.
[#7400](https://github.com/rust-lang/cargo/pull/7400)
- Wasm32: `.wasm` files are no longer treated as an "executable", allowing
`cargo test` and `cargo run` to work properly with the generated `.js` file.
[#7476](https://github.com/rust-lang/cargo/pull/7476)
- crates.io now supports SPDX 3.6 licenses.
[#7481](https://github.com/rust-lang/cargo/pull/7481)
- Improved cyclic dependency error message.
[#7470](https://github.com/rust-lang/cargo/pull/7470)
- Bare `cargo clean` no longer locks the package cache.
[#7502](https://github.com/rust-lang/cargo/pull/7502)
- `cargo publish` now allows dev-dependencies without a version key to be
published. A git or path-only dev-dependency will be removed from the
package manifest before uploading.
[#7333](https://github.com/rust-lang/cargo/pull/7333)
- (Nightly only): Profile overrides have renamed the syntax to be
`[profile.dev.package.NAME]`.
[#7504](https://github.com/rust-lang/cargo/pull/7504)
- `--features` and `--no-default-features` in the root of a virtual workspace
will now generate an error instead of being ignored.
[#7507](https://github.com/rust-lang/cargo/pull/7507)
- Generated files (like `Cargo.toml` and `Cargo.lock`) in a package archive
now have their timestamp set to the current time instead of the epoch.
[#7523](https://github.com/rust-lang/cargo/pull/7523)
- The `-Z` flag parser is now more strict, rejecting more invalid syntax.
[#7531](https://github.com/rust-lang/cargo/pull/7531)

### Fixed
- Fixed an issue where if a package had an `include` field, and `Cargo.lock`
Expand All @@ -21,9 +82,14 @@
[#7448](https://github.com/rust-lang/cargo/pull/7448)
- Fixed a panic in a particular combination of `[patch]` entries.
[#7452](https://github.com/rust-lang/cargo/pull/7452)
- Windows: Better error message when `cargo test` or `rustc` crashes in an
abnormal way, such as a signal or seg fault.
[#7535](https://github.com/rust-lang/cargo/pull/7535)
- (Nightly only): Fixed warnings for unused profile overrides in a workspace.
[#7536](https://github.com/rust-lang/cargo/pull/7536)

## Cargo 1.39 (2019-11-07)
[e853aa97...4b105b6a](https://github.com/rust-lang/cargo/compare/e853aa97...4b105b6a)
[e853aa97...1c6ec66d](https://github.com/rust-lang/cargo/compare/e853aa97...1c6ec66d)

### Added
- Config files may now use the `.toml` filename extension.
Expand Down Expand Up @@ -90,6 +156,10 @@
changed. It now chooses the crate with the greatest number of transitive
crates waiting on it. Previously it used a maximum topological depth.
[#7390](https://github.com/rust-lang/cargo/pull/7390)
- RUSTFLAGS are no longer incorporated in the metadata and filename hash,
reversing the change from 1.33 that added it. This means that any change to
RUSTFLAGS will cause a recompile, and will not affect symbol munging.
[#7459](https://github.com/rust-lang/cargo/pull/7459)

### Fixed
- Git dependencies with submodules with shorthand SSH URLs (like
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cargo"
version = "0.41.0"
version = "0.42.0"
edition = "2018"
authors = ["Yehuda Katz <wycats@gmail.com>",
"Carl Lerche <me@carllerche.com>",
Expand All @@ -22,7 +22,7 @@ path = "src/cargo/lib.rs"
atty = "0.2"
bytesize = "1.0"
cargo-platform = { path = "crates/cargo-platform", version = "0.1" }
crates-io = { path = "crates/crates-io", version = "0.29" }
crates-io = { path = "crates/crates-io", version = "0.30" }
crossbeam-utils = "0.7"
crypto-hash = "0.3.1"
curl = { version = "0.4.23", features = ["http2"] }
Expand Down
6 changes: 3 additions & 3 deletions crates/cargo-test-support/src/paths.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ impl CargoPathExt for Path {

fn move_in_time<F>(&self, travel_amount: F)
where
F: Fn(i64, u32) -> ((i64, u32)),
F: Fn(i64, u32) -> (i64, u32),
{
if self.is_file() {
time_travel(self, &travel_amount);
Expand All @@ -137,7 +137,7 @@ impl CargoPathExt for Path {

fn recurse<F>(p: &Path, bad: &Path, travel_amount: &F)
where
F: Fn(i64, u32) -> ((i64, u32)),
F: Fn(i64, u32) -> (i64, u32),
{
if p.is_file() {
time_travel(p, travel_amount)
Expand All @@ -151,7 +151,7 @@ impl CargoPathExt for Path {

fn time_travel<F>(path: &Path, travel_amount: &F)
where
F: Fn(i64, u32) -> ((i64, u32)),
F: Fn(i64, u32) -> (i64, u32),
{
let stat = t!(path.symlink_metadata());

Expand Down
2 changes: 1 addition & 1 deletion crates/crates-io/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "crates-io"
version = "0.29.0"
version = "0.30.0"
edition = "2018"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
license = "MIT OR Apache-2.0"
Expand Down
21 changes: 3 additions & 18 deletions src/cargo/core/compiler/compilation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use semver::Version;
use super::BuildContext;
use crate::core::compiler::CompileKind;
use crate::core::{Edition, InternedString, Package, PackageId, Target};
use crate::util::{self, join_paths, process, rustc::Rustc, CargoResult, Config, ProcessBuilder};
use crate::util::{self, join_paths, process, CargoResult, Config, ProcessBuilder};

pub struct Doctest {
/// The package being doc-tested.
Expand Down Expand Up @@ -75,7 +75,6 @@ pub struct Compilation<'cfg> {
primary_unit_rustc_process: Option<ProcessBuilder>,

target_runner: Option<(PathBuf, Vec<String>)>,
supports_rustdoc_crate_type: bool,
}

impl<'cfg> Compilation<'cfg> {
Expand Down Expand Up @@ -115,7 +114,6 @@ impl<'cfg> Compilation<'cfg> {
host: bcx.host_triple().to_string(),
target: default_kind.short_name(bcx).to_string(),
target_runner: target_runner(bcx, default_kind)?,
supports_rustdoc_crate_type: supports_rustdoc_crate_type(bcx.config, &bcx.rustc)?,
})
}

Expand Down Expand Up @@ -148,10 +146,8 @@ impl<'cfg> Compilation<'cfg> {
p.arg(format!("--edition={}", target.edition()));
}

if self.supports_rustdoc_crate_type {
for crate_type in target.rustc_crate_types() {
p.arg("--crate-type").arg(crate_type);
}
for crate_type in target.rustc_crate_types() {
p.arg("--crate-type").arg(crate_type);
}

Ok(p)
Expand Down Expand Up @@ -331,14 +327,3 @@ fn target_runner(

Ok(None)
}

fn supports_rustdoc_crate_type(config: &Config, rustc: &Rustc) -> CargoResult<bool> {
// NOTE: Unconditionally return 'true' once support for
// rustdoc '--crate-type' rides to stable
let mut crate_type_test = process(config.rustdoc()?);
// If '--crate-type' is not supported by rustcoc, this command
// will exit with an error. Otherwise, it will print a help message,
// and exit successfully
crate_type_test.args(&["--crate-type", "proc-macro", "--help"]);
Ok(rustc.cached_output(&crate_type_test).is_ok())
}
5 changes: 0 additions & 5 deletions tests/testsuite/build_script.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2276,11 +2276,6 @@ fn flags_go_into_tests() {

#[cargo_test]
fn diamond_passes_args_only_once() {
// FIXME: when pipelining rides to stable, enable this test on all channels.
if !cargo_test_support::is_nightly() {
return;
}

let p = project()
.file(
"Cargo.toml",
Expand Down
5 changes: 0 additions & 5 deletions tests/testsuite/rustc_info_cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ use std::env;

#[cargo_test]
fn rustc_info_cache() {
// FIXME: when pipelining rides to stable, enable this test on all channels.
if !cargo_test_support::is_nightly() {
return;
}

let p = project()
.file("src/main.rs", r#"fn main() { println!("hello"); }"#)
.build();
Expand Down
7 changes: 1 addition & 6 deletions tests/testsuite/rustdoc.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use cargo_test_support::{basic_manifest, is_nightly, project};
use cargo_test_support::{basic_manifest, project};

#[cargo_test]
fn rustdoc_simple() {
Expand Down Expand Up @@ -163,11 +163,6 @@ fn features() {

#[cargo_test]
fn proc_macro_crate_type() {
// NOTE - Remove this once 'rustdoc --crate-type'
// rides to stable
if !is_nightly() {
return;
}
let p = project()
.file(
"Cargo.toml",
Expand Down