Skip to content

Commit fe5b13d

Browse files
committed
Auto merge of #97128 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum
[stable] 1.61 stable rebuild * New version of release notes (from as-yet unmerged #96539) * Manual patch to drop clippy's needless_match lint to nursery, per [discussion on Zulip](https://rust-lang.zulipchat.com/#narrow/stream/241545-t-release/topic/release.201.2E61.2E0/near/282717457) r? `@Mark-Simulacrum`
2 parents 66a356d + f9567f1 commit fe5b13d

File tree

5 files changed

+12
-20
lines changed

5 files changed

+12
-20
lines changed

RELEASES.md

+10-17
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Libraries
2222

2323
- [`ManuallyDrop<T>` is now documented to have the same layout as `T`][88375]
2424
- [`#[ignore = "…"]` messages are printed when running tests][92714]
25-
- [Consistently present absent stdio handles on Windows as NULL handles][93263]
25+
- [Consistently show absent stdio handles on Windows as NULL handles][93263]
2626
- [Make `std::io::stdio::lock()` return `'static` handles.][93965] Previously, the creation of locked handles to stdin/stdout/stderr would borrow the handles being locked, which prevented writing `let out = std::io::stdout().lock();` because `out` would outlive the return value of `stdout()`. Such code now works, eliminating a common pitfall that affected many Rust users.
2727
- [`Vec::from_raw_parts` is now less restrictive about its inputs][95016]
2828
- [`std::thread::available_parallelism` now takes cgroup quotas into account.][92697] Since `available_parallelism` is often used to create a thread pool for parallel computation, which may be CPU-bound for performance, `available_parallelism` will return a value consistent with the ability to use that many threads continuously, if possible. For instance, in a container with 8 virtual CPUs but quotas only allowing for 50% usage, `available_parallelism` will return 4.
@@ -41,15 +41,15 @@ Stabilized APIs
4141

4242
These APIs are now usable in const contexts:
4343

44-
- [`*const T::offset` and `*mut T::offset`][ptr-offset]
45-
- [`*const T::wrapping_offset` and `*mut T::wrapping_offset`][ptr-wrapping_offset]
46-
- [`*const T::add` and `*mut T::add`][ptr-add]
47-
- [`*const T::sub` and `*mut T::sub`][ptr-sub]
48-
- [`*const T::wrapping_add` and `*mut T::wrapping_add`][ptr-wrapping_add]
49-
- [`*const T::wrapping_sub` and `*mut T::wrapping_sub`][ptr-wrapping_sub]
50-
- [`[T]::as_mut_ptr`][slice-as_mut_ptr]
51-
- [`[T]::as_ptr_range`][slice-as_ptr_range]
52-
- [`[T]::as_mut_ptr_range`][slice-as_mut_ptr_range]
44+
- [`<*const T>::offset` and `<*mut T>::offset`][ptr-offset]
45+
- [`<*const T>::wrapping_offset` and `<*mut T>::wrapping_offset`][ptr-wrapping_offset]
46+
- [`<*const T>::add` and `<*mut T>::add`][ptr-add]
47+
- [`<*const T>::sub` and `<*mut T>::sub`][ptr-sub]
48+
- [`<*const T>::wrapping_add` and `<*mut T>::wrapping_add`][ptr-wrapping_add]
49+
- [`<*const T>::wrapping_sub` and `<*mut T>::wrapping_sub`][ptr-wrapping_sub]
50+
- [`<[T]>::as_mut_ptr`][slice-as_mut_ptr]
51+
- [`<[T]>::as_ptr_range`][slice-as_ptr_range]
52+
- [`<[T]>::as_mut_ptr_range`][slice-as_mut_ptr_range]
5353

5454
Cargo
5555
-----
@@ -85,28 +85,21 @@ and related tools.
8585
[90621]: https://github.com/rust-lang/rust/pull/90621/
8686
[92285]: https://github.com/rust-lang/rust/pull/92285/
8787
[92472]: https://github.com/rust-lang/rust/pull/92472/
88-
[92663]: https://github.com/rust-lang/rust/pull/92663/
8988
[92697]: https://github.com/rust-lang/rust/pull/92697/
9089
[92714]: https://github.com/rust-lang/rust/pull/92714/
9190
[92911]: https://github.com/rust-lang/rust/pull/92911/
9291
[93263]: https://github.com/rust-lang/rust/pull/93263/
93-
[93580]: https://github.com/rust-lang/rust/pull/93580/
9492
[93745]: https://github.com/rust-lang/rust/pull/93745/
9593
[93827]: https://github.com/rust-lang/rust/pull/93827/
96-
[93840]: https://github.com/rust-lang/rust/pull/93840/
9794
[93901]: https://github.com/rust-lang/rust/pull/93901/
9895
[93913]: https://github.com/rust-lang/rust/pull/93913/
99-
[93957]: https://github.com/rust-lang/rust/pull/93957/
10096
[93965]: https://github.com/rust-lang/rust/pull/93965/
10197
[94081]: https://github.com/rust-lang/rust/pull/94081/
10298
[94261]: https://github.com/rust-lang/rust/pull/94261/
10399
[94295]: https://github.com/rust-lang/rust/pull/94295/
104-
[94356]: https://github.com/rust-lang/rust/pull/94356/
105100
[94832]: https://github.com/rust-lang/rust/pull/94832/
106101
[95016]: https://github.com/rust-lang/rust/pull/95016/
107-
[95130]: https://github.com/rust-lang/rust/pull/95130/
108102
[95251]: https://github.com/rust-lang/rust/pull/95251/
109-
[95491]: https://github.com/rust-lang/rust/pull/95491/
110103
[`+whole-archive`]: https://doc.rust-lang.org/stable/rustc/command-line-arguments.html#linking-modifiers-whole-archive
111104
[`Pin::static_mut`]: https://doc.rust-lang.org/stable/std/pin/struct.Pin.html#method.static_mut
112105
[`Pin::static_ref`]: https://doc.rust-lang.org/stable/std/pin/struct.Pin.html#method.static_ref

src/tools/clippy/clippy_lints/src/lib.register_all.rs

-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ store.register_group(true, "clippy::all", Some("clippy_all"), vec![
139139
LintId::of(matches::MATCH_OVERLAPPING_ARM),
140140
LintId::of(matches::MATCH_REF_PATS),
141141
LintId::of(matches::MATCH_SINGLE_BINDING),
142-
LintId::of(matches::NEEDLESS_MATCH),
143142
LintId::of(matches::REDUNDANT_PATTERN_MATCHING),
144143
LintId::of(matches::SINGLE_MATCH),
145144
LintId::of(matches::WILDCARD_IN_OR_PATTERNS),

src/tools/clippy/clippy_lints/src/lib.register_complexity.rs

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ store.register_group(true, "clippy::complexity", Some("clippy_complexity"), vec!
3030
LintId::of(map_unit_fn::RESULT_MAP_UNIT_FN),
3131
LintId::of(matches::MATCH_AS_REF),
3232
LintId::of(matches::MATCH_SINGLE_BINDING),
33-
LintId::of(matches::NEEDLESS_MATCH),
3433
LintId::of(matches::WILDCARD_IN_OR_PATTERNS),
3534
LintId::of(methods::BIND_INSTEAD_OF_MAP),
3635
LintId::of(methods::CLONE_ON_COPY),

src/tools/clippy/clippy_lints/src/lib.register_nursery.rs

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ store.register_group(true, "clippy::nursery", Some("clippy_nursery"), vec![
1313
LintId::of(future_not_send::FUTURE_NOT_SEND),
1414
LintId::of(index_refutable_slice::INDEX_REFUTABLE_SLICE),
1515
LintId::of(let_if_seq::USELESS_LET_IF_SEQ),
16+
LintId::of(matches::NEEDLESS_MATCH),
1617
LintId::of(methods::ITER_WITH_DRAIN),
1718
LintId::of(missing_const_for_fn::MISSING_CONST_FOR_FN),
1819
LintId::of(mutable_debug_assertion::DEBUG_ASSERT_WITH_MUT_CALL),

src/tools/clippy/clippy_lints/src/matches/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ declare_clippy_lint! {
606606
/// ```
607607
#[clippy::version = "1.61.0"]
608608
pub NEEDLESS_MATCH,
609-
complexity,
609+
nursery,
610610
"`match` or match-like `if let` that are unnecessary"
611611
}
612612

0 commit comments

Comments
 (0)