diff --git a/Cargo.lock b/Cargo.lock index 9c359b464ef1d..6ddc7944092da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1642,9 +1642,9 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.19" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b06c1b455f1cf4269a8cfc320ab930a810e2375a42af5075eb8a8b36405ce0" +checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2" dependencies = [ "libc", ] diff --git a/RELEASES.md b/RELEASES.md index 02edb0cf83c98..10e485c1a40d5 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -62,9 +62,9 @@ Cargo - [Cargo.lock now uses a more git friendly format that should help to reduce merge conflicts.][cargo/7579] - [You can now override specific dependencies's build settings][cargo/7591] E.g. - `[profile.dev.overrides.image] opt-level = 2` sets the `image` crate's + `[profile.dev.package.image] opt-level = 2` sets the `image` crate's optimisation level to `2` for debug builds. You can also use - `[profile..build_overrides]` to override build scripts and + `[profile..build-override]` to override build scripts and their dependencies. Misc diff --git a/src/stage0.txt b/src/stage0.txt index aa55aa6a7e25d..99d2062d3f8ad 100644 --- a/src/stage0.txt +++ b/src/stage0.txt @@ -12,7 +12,7 @@ # source tarball for a stable release you'll likely see `1.x.0` for rustc and # `0.x.0` for Cargo where they were released on `date`. -date: 2020-01-27 +date: 2020-01-30 rustc: 1.41.0 cargo: 0.42.0 @@ -39,4 +39,4 @@ cargo: 0.42.0 # looking at a beta source tarball and it's uncommented we'll shortly comment it # out. -dev: 1 +#dev: 1 diff --git a/src/tools/cargo b/src/tools/cargo index 9d32b7b014090..86334295e82ef 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit 9d32b7b01409024b165545c568b1525d86e2b7cb +Subproject commit 86334295e82ef241fe5ec618d9fb612585bd7c1f