Skip to content

Commit 3ea00c5

Browse files
committed
Auto merge of #60198 - pietroalbini:stable-next, r=Mark-Simulacrum
[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 * rust-lang/rust-clippy#3805: Fix ICE https://github.com/rust-lang/rust-clippy/issue/3747 * rust-lang/rust-clippy#3821: do not trigger redundant_closure when there is a difference in borrow... * rust-lang/rust-clippy#3844: Fix two missing_const_for_fn false positives
2 parents 91856ed + 34aed3d commit 3ea00c5

File tree

3 files changed

+23
-12
lines changed

3 files changed

+23
-12
lines changed

RELEASES.md

+21-10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
Version 1.34.1 (2019-04-25)
2+
===========================
3+
4+
* [Fix false positives for the `redundant_closure` Clippy lint][clippy/3821]
5+
* [Fix false positives for the `missing_const_for_fn` Clippy lint][clippy/3844]
6+
* [Fix Clippy panic when checking some macros][clippy/3805]
7+
8+
[clippy/3821]: https://github.com/rust-lang/rust-clippy/pull/3821
9+
[clippy/3844]: https://github.com/rust-lang/rust-clippy/pull/3844
10+
[clippy/3805]: https://github.com/rust-lang/rust-clippy/pull/3805
11+
112
Version 1.34.0 (2019-04-11)
213
==========================
314

@@ -113,15 +124,15 @@ Compatibility Notes
113124
[56470]: https://github.com/rust-lang/rust/pull/56470/
114125
[cargo/6654]: https://github.com/rust-lang/cargo/pull/6654/
115126
[`Any::type_id`]: https://doc.rust-lang.org/std/any/trait.Any.html#tymethod.type_id
116-
[`Error::type_id`]: https://doc.rust-lang.org/std/error/trait.Error.html#tymethod.type_id
117-
[`atomic::AtomicI16`]: https://doc.rust-lang.org/std/atomic/struct.AtomicI16.html
118-
[`atomic::AtomicI32`]: https://doc.rust-lang.org/std/atomic/struct.AtomicI32.html
119-
[`atomic::AtomicI64`]: https://doc.rust-lang.org/std/atomic/struct.AtomicI64.html
120-
[`atomic::AtomicI8`]: https://doc.rust-lang.org/std/atomic/struct.AtomicI8.html
121-
[`atomic::AtomicU16`]: https://doc.rust-lang.org/std/atomic/struct.AtomicU16.html
122-
[`atomic::AtomicU32`]: https://doc.rust-lang.org/std/atomic/struct.AtomicU32.html
123-
[`atomic::AtomicU64`]: https://doc.rust-lang.org/std/atomic/struct.AtomicU64.html
124-
[`atomic::AtomicU8`]: https://doc.rust-lang.org/std/atomic/struct.AtomicU8.html
127+
[`Error::type_id`]: https://doc.rust-lang.org/std/error/trait.Error.html#method.type_id
128+
[`atomic::AtomicI16`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicI16.html
129+
[`atomic::AtomicI32`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicI32.html
130+
[`atomic::AtomicI64`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicI64.html
131+
[`atomic::AtomicI8`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicI8.html
132+
[`atomic::AtomicU16`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicU16.html
133+
[`atomic::AtomicU32`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicU32.html
134+
[`atomic::AtomicU64`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicU64.html
135+
[`atomic::AtomicU8`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicU8.html
125136
[`convert::Infallible`]: https://doc.rust-lang.org/std/convert/enum.Infallible.html
126137
[`convert::TryFrom`]: https://doc.rust-lang.org/std/convert/trait.TryFrom.html
127138
[`convert::TryInto`]: https://doc.rust-lang.org/std/convert/trait.TryInto.html
@@ -133,7 +144,7 @@ Compatibility Notes
133144
[`num::NonZeroI64`]: https://doc.rust-lang.org/std/num/struct.NonZeroI64.html
134145
[`num::NonZeroI8`]: https://doc.rust-lang.org/std/num/struct.NonZeroI8.html
135146
[`num::NonZeroIsize`]: https://doc.rust-lang.org/std/num/struct.NonZeroIsize.html
136-
[`slice::sort_by_cached_key`]: https://doc.rust-lang.org/std/slice/fn.sort_by_cached_key
147+
[`slice::sort_by_cached_key`]: https://doc.rust-lang.org/std/primitive.slice.html#method.sort_by_cached_key
137148
[`str::escape_debug`]: https://doc.rust-lang.org/std/primitive.str.html#method.escape_debug
138149
[`str::escape_default`]: https://doc.rust-lang.org/std/primitive.str.html#method.escape_default
139150
[`str::escape_unicode`]: https://doc.rust-lang.org/std/primitive.str.html#method.escape_unicode

src/bootstrap/channel.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use crate::Build;
1414
use crate::config::Config;
1515

1616
// The version number
17-
pub const CFG_RELEASE_NUM: &str = "1.34.0";
17+
pub const CFG_RELEASE_NUM: &str = "1.34.1";
1818

1919
pub struct GitInfo {
2020
inner: Option<Info>,

src/tools/clippy

0 commit comments

Comments
 (0)