Skip to content

Commit 86f329b

Browse files
committed
Auto merge of #68906 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum
[beta] backports * Update jobserver crate to 0.1.21 #68663 * Changelog: Demonstrate final build-override syntax #68603 * [beta] Update cargo #68900 * Uses static.r-l.o instead of dev-static as well.
2 parents 3d2613e + 279e1f6 commit 86f329b

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -1642,9 +1642,9 @@ dependencies = [
16421642

16431643
[[package]]
16441644
name = "jobserver"
1645-
version = "0.1.19"
1645+
version = "0.1.21"
16461646
source = "registry+https://github.com/rust-lang/crates.io-index"
1647-
checksum = "67b06c1b455f1cf4269a8cfc320ab930a810e2375a42af5075eb8a8b36405ce0"
1647+
checksum = "5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2"
16481648
dependencies = [
16491649
"libc",
16501650
]

RELEASES.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ Cargo
6262
- [Cargo.lock now uses a more git friendly format that should help to reduce
6363
merge conflicts.][cargo/7579]
6464
- [You can now override specific dependencies's build settings][cargo/7591] E.g.
65-
`[profile.dev.overrides.image] opt-level = 2` sets the `image` crate's
65+
`[profile.dev.package.image] opt-level = 2` sets the `image` crate's
6666
optimisation level to `2` for debug builds. You can also use
67-
`[profile.<profile>.build_overrides]` to override build scripts and
67+
`[profile.<profile>.build-override]` to override build scripts and
6868
their dependencies.
6969

7070
Misc

src/stage0.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
1313
# `0.x.0` for Cargo where they were released on `date`.
1414

15-
date: 2020-01-27
15+
date: 2020-01-30
1616
rustc: 1.41.0
1717
cargo: 0.42.0
1818

@@ -39,4 +39,4 @@ cargo: 0.42.0
3939
# looking at a beta source tarball and it's uncommented we'll shortly comment it
4040
# out.
4141

42-
dev: 1
42+
#dev: 1

0 commit comments

Comments
 (0)