Skip to content

Commit 04488af

Browse files
committed
Auto merge of #75878 - pietroalbini:stable-next, r=Mark-Simulacrum
[stable] Prepare Rust 1.46.0 Also updated the compatibility notes to account for the regressions we didn't fix for this release. The release team evaluated them, and we agreed they're not enough to block the release. r? @Mark-Simulacrum cc @rust-lang/release
2 parents cfbc6d4 + ed6d57b commit 04488af

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

RELEASES.md

+13-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,19 @@ Compatibility Notes
6868
- [Rustc now correctly relates the lifetime of an existential associated
6969
type.][71896] This fixes some edge cases where `rustc` would erroneously allow
7070
you to pass a shorter lifetime than expected.
71-
71+
- [Rustc now dynamically links to `libz` (also called `zlib`) on Linux.][74420]
72+
The library will need to be installed for `rustc` to work, even though we
73+
expect it to be already available on most systems.
74+
- [Tests annotated with `#[should_panic]` are broken on ARMv7 while running
75+
under QEMU.][74820]
76+
- [Pretty printing of some tokens in procedural macros changed.][75453] The
77+
exact output returned by rustc's pretty printing is an unstable
78+
implementation detail: we recommend any macro relying on it to switch to a
79+
more robust parsing system.
80+
81+
[75453]: https://github.com/rust-lang/rust/issues/75453/
82+
[74820]: https://github.com/rust-lang/rust/issues/74820/
83+
[74420]: https://github.com/rust-lang/rust/issues/74420/
7284
[74109]: https://github.com/rust-lang/rust/pull/74109/
7385
[74150]: https://github.com/rust-lang/rust/pull/74150/
7486
[73862]: https://github.com/rust-lang/rust/pull/73862/

src/ci/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fi
5151
#
5252
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
5353
# either automatically or manually.
54-
export RUST_RELEASE_CHANNEL=beta
54+
export RUST_RELEASE_CHANNEL=stable
5555

5656
# Always set the release channel for bootstrap; this is normally not important (i.e., only dist
5757
# builds would seem to matter) but in practice bootstrap wants to know whether we're targeting

src/stage0.txt

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

15-
date: 2020-07-13
16-
rustc: 1.45.0
17-
cargo: 0.46.0
15+
date: 2020-08-03
16+
rustc: 1.45.2
17+
cargo: 0.46.1
1818

1919
# We use a nightly rustfmt to format the source because it solves some
2020
# bootstrapping issues with use of new syntax in this repo. If you're looking at
@@ -40,4 +40,4 @@ cargo: 0.46.0
4040
# looking at a beta source tarball and it's uncommented we'll shortly comment it
4141
# out.
4242

43-
dev: 1
43+
#dev: 1

0 commit comments

Comments
 (0)