Skip to content

Commit 4f3ab69

Browse files
committed
Auto merge of #10126 - flip1995:rustup, r=flip1995
Rustup r? `@ghost` Love this time of the year. No conflicts, because no one merges anything. changelog: none
2 parents 22af8fe + 1f97186 commit 4f3ab69

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ Current stable, released 2022-12-15
4848
[#8518](https://github.com/rust-lang/rust-clippy/pull/8518)
4949
* Moved [`implicit_saturating_sub`] to `style` (Now warn-by-default)
5050
[#9584](https://github.com/rust-lang/rust-clippy/pull/9584)
51-
* Moved [`derive_partial_eq_without_eq`] to `nursery` (now allow-by-default)
52-
[#9535](https://github.com/rust-lang/rust-clippy/pull/9535)
51+
* Moved `derive_partial_eq_without_eq` to `nursery` (now allow-by-default)
52+
[#9536](https://github.com/rust-lang/rust-clippy/pull/9536)
5353

5454
### Enhancements
5555

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2022-12-17"
2+
channel = "nightly-2022-12-29"
33
components = ["cargo", "llvm-tools", "rust-src", "rust-std", "rustc", "rustc-dev", "rustfmt"]

tests/ui/borrow_interior_mutable_const/others.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ impl<T> StaticRef<T> {
4242
impl<T> std::ops::Deref for StaticRef<T> {
4343
type Target = T;
4444

45-
fn deref(&self) -> &'static T {
45+
fn deref(&self) -> &T {
4646
unsafe { &*self.ptr }
4747
}
4848
}

0 commit comments

Comments
 (0)