diff options
| author | bors <bors@rust-lang.org> | 2019-04-24 21:04:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-24 21:04:57 +0000 |
| commit | fc50f328b0353b285421b8ff5d4100966387a997 (patch) | |
| tree | 563b072a4045583944aa125b5f497354e5bc7945 | |
| parent | 91856ed52c58aa5ba66a015354d1cc69e9779bdf (diff) | |
| parent | d8a026d3bf7536e5233e6a5df42ca677a343c749 (diff) | |
| download | rust-fc50f328b0353b285421b8ff5d4100966387a997.tar.gz rust-fc50f328b0353b285421b8ff5d4100966387a997.zip | |
Auto merge of #60198 - pietroalbini:stable-next, r=Mark-Simulacrum 1.34.1
[stable] 1.34.1 point release The release date is April 25th. Included in this point release: * #59891: Fix the link to sort_by_cached_key * #59989: Fix links to Atomic* in RELEASES.md * https://github.com/rust-lang/rust-clippy/pull/3805: Fix ICE https://github.com/rust-lang/rust-clippy/issue/3747 * https://github.com/rust-lang/rust-clippy/pull/3821: do not trigger redundant_closure when there is a difference in borrow... * https://github.com/rust-lang/rust-clippy/pull/3844: Fix two missing_const_for_fn false positives
| -rw-r--r-- | RELEASES.md | 31 | ||||
| -rw-r--r-- | appveyor.yml | 4 | ||||
| -rw-r--r-- | src/bootstrap/channel.rs | 2 | ||||
| m--------- | src/tools/clippy | 24 |
4 files changed, 45 insertions, 16 deletions
diff --git a/RELEASES.md b/RELEASES.md index 821889d64a5..3b4f4182702 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,3 +1,14 @@ +Version 1.34.1 (2019-04-25) +=========================== + +* [Fix false positives for the `redundant_closure` Clippy lint][clippy/3821] +* [Fix false positives for the `missing_const_for_fn` Clippy lint][clippy/3844] +* [Fix Clippy panic when checking some macros][clippy/3805] + +[clippy/3821]: https://github.com/rust-lang/rust-clippy/pull/3821 +[clippy/3844]: https://github.com/rust-lang/rust-clippy/pull/3844 +[clippy/3805]: https://github.com/rust-lang/rust-clippy/pull/3805 + Version 1.34.0 (2019-04-11) ========================== @@ -113,15 +124,15 @@ Compatibility Notes [56470]: https://github.com/rust-lang/rust/pull/56470/ [cargo/6654]: https://github.com/rust-lang/cargo/pull/6654/ [`Any::type_id`]: https://doc.rust-lang.org/std/any/trait.Any.html#tymethod.type_id -[`Error::type_id`]: https://doc.rust-lang.org/std/error/trait.Error.html#tymethod.type_id -[`atomic::AtomicI16`]: https://doc.rust-lang.org/std/atomic/struct.AtomicI16.html -[`atomic::AtomicI32`]: https://doc.rust-lang.org/std/atomic/struct.AtomicI32.html -[`atomic::AtomicI64`]: https://doc.rust-lang.org/std/atomic/struct.AtomicI64.html -[`atomic::AtomicI8`]: https://doc.rust-lang.org/std/atomic/struct.AtomicI8.html -[`atomic::AtomicU16`]: https://doc.rust-lang.org/std/atomic/struct.AtomicU16.html -[`atomic::AtomicU32`]: https://doc.rust-lang.org/std/atomic/struct.AtomicU32.html -[`atomic::AtomicU64`]: https://doc.rust-lang.org/std/atomic/struct.AtomicU64.html -[`atomic::AtomicU8`]: https://doc.rust-lang.org/std/atomic/struct.AtomicU8.html +[`Error::type_id`]: https://doc.rust-lang.org/std/error/trait.Error.html#method.type_id +[`atomic::AtomicI16`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicI16.html +[`atomic::AtomicI32`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicI32.html +[`atomic::AtomicI64`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicI64.html +[`atomic::AtomicI8`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicI8.html +[`atomic::AtomicU16`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicU16.html +[`atomic::AtomicU32`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicU32.html +[`atomic::AtomicU64`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicU64.html +[`atomic::AtomicU8`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicU8.html [`convert::Infallible`]: https://doc.rust-lang.org/std/convert/enum.Infallible.html [`convert::TryFrom`]: https://doc.rust-lang.org/std/convert/trait.TryFrom.html [`convert::TryInto`]: https://doc.rust-lang.org/std/convert/trait.TryInto.html @@ -133,7 +144,7 @@ Compatibility Notes [`num::NonZeroI64`]: https://doc.rust-lang.org/std/num/struct.NonZeroI64.html [`num::NonZeroI8`]: https://doc.rust-lang.org/std/num/struct.NonZeroI8.html [`num::NonZeroIsize`]: https://doc.rust-lang.org/std/num/struct.NonZeroIsize.html -[`slice::sort_by_cached_key`]: https://doc.rust-lang.org/std/slice/fn.sort_by_cached_key +[`slice::sort_by_cached_key`]: https://doc.rust-lang.org/std/primitive.slice.html#method.sort_by_cached_key [`str::escape_debug`]: https://doc.rust-lang.org/std/primitive.str.html#method.escape_debug [`str::escape_default`]: https://doc.rust-lang.org/std/primitive.str.html#method.escape_default [`str::escape_unicode`]: https://doc.rust-lang.org/std/primitive.str.html#method.escape_unicode diff --git a/appveyor.yml b/appveyor.yml index 3a0cb8b4fce..37cdd1258a5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,7 @@ +# LLDB seems missing on the stable branch, while it's fine on the master +# branch. This is a temporary fix to get 1.34.1 out. +image: Previous Visual Studio 2017 + environment: # By default schannel checks revocation of certificates unlike some other SSL diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs index 0b2f62485c9..d12094867b2 100644 --- a/src/bootstrap/channel.rs +++ b/src/bootstrap/channel.rs @@ -14,7 +14,7 @@ use crate::Build; use crate::config::Config; // The version number -pub const CFG_RELEASE_NUM: &str = "1.34.0"; +pub const CFG_RELEASE_NUM: &str = "1.34.1"; pub struct GitInfo { inner: Option<Info>, diff --git a/src/tools/clippy b/src/tools/clippy -Subproject 1fac38088609747627b07807945224cf1ea642c +Subproject 726176e322c0d2182b7eddc857e5105e3915a67 |
