2023-09-23 11:11:11

by Gary Guo

[permalink] [raw]
Subject: [PATCH] rust: remove ignores for `clippy::new_ret_no_self`

The clippy false positive triggering `new_ret_no_self` lint when using
`pin_init!` macro is fixed in 1.67, so remove all `#[allow]`s ignoring
the lint.

Signed-off-by: Gary Guo <[email protected]>
---
rust/kernel/init.rs | 20 ++++++++++----------
rust/kernel/sync/condvar.rs | 1 -
rust/kernel/sync/lock.rs | 1 -
3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/rust/kernel/init.rs b/rust/kernel/init.rs
index 4ebb6f23fc2e..65be9ae57b80 100644
--- a/rust/kernel/init.rs
+++ b/rust/kernel/init.rs
@@ -35,7 +35,7 @@
//! that you need to write `<-` instead of `:` for fields that you want to initialize in-place.
//!
//! ```rust
-//! # #![allow(clippy::disallowed_names, clippy::new_ret_no_self)]
+//! # #![allow(clippy::disallowed_names)]
//! use kernel::{prelude::*, sync::Mutex, new_mutex};
//! # use core::pin::Pin;
//! #[pin_data]
@@ -55,7 +55,7 @@
//! (or just the stack) to actually initialize a `Foo`:
//!
//! ```rust
-//! # #![allow(clippy::disallowed_names, clippy::new_ret_no_self)]
+//! # #![allow(clippy::disallowed_names)]
//! # use kernel::{prelude::*, sync::Mutex, new_mutex};
//! # use core::pin::Pin;
//! # #[pin_data]
@@ -86,7 +86,7 @@
//! To declare an init macro/function you just return an [`impl PinInit<T, E>`]:
//!
//! ```rust
-//! # #![allow(clippy::disallowed_names, clippy::new_ret_no_self)]
+//! # #![allow(clippy::disallowed_names)]
//! # use kernel::{sync::Mutex, prelude::*, new_mutex, init::PinInit, try_pin_init};
//! #[pin_data]
//! struct DriverData {
@@ -236,7 +236,7 @@
/// # Examples
///
/// ```rust
-/// # #![allow(clippy::disallowed_names, clippy::new_ret_no_self)]
+/// # #![allow(clippy::disallowed_names)]
/// # use kernel::{init, macros::pin_data, pin_init, stack_pin_init, init::*, sync::Mutex, new_mutex};
/// # use core::pin::Pin;
/// #[pin_data]
@@ -288,7 +288,7 @@ macro_rules! stack_pin_init {
/// # Examples
///
/// ```rust,ignore
-/// # #![allow(clippy::disallowed_names, clippy::new_ret_no_self)]
+/// # #![allow(clippy::disallowed_names)]
/// # use kernel::{init, pin_init, stack_try_pin_init, init::*, sync::Mutex, new_mutex};
/// # use macros::pin_data;
/// # use core::{alloc::AllocError, pin::Pin};
@@ -314,7 +314,7 @@ macro_rules! stack_pin_init {
/// ```
///
/// ```rust,ignore
-/// # #![allow(clippy::disallowed_names, clippy::new_ret_no_self)]
+/// # #![allow(clippy::disallowed_names)]
/// # use kernel::{init, pin_init, stack_try_pin_init, init::*, sync::Mutex, new_mutex};
/// # use macros::pin_data;
/// # use core::{alloc::AllocError, pin::Pin};
@@ -366,7 +366,7 @@ macro_rules! stack_try_pin_init {
/// The syntax is almost identical to that of a normal `struct` initializer:
///
/// ```rust
-/// # #![allow(clippy::disallowed_names, clippy::new_ret_no_self)]
+/// # #![allow(clippy::disallowed_names)]
/// # use kernel::{init, pin_init, macros::pin_data, init::*};
/// # use core::pin::Pin;
/// #[pin_data]
@@ -411,7 +411,7 @@ macro_rules! stack_try_pin_init {
/// To create an initializer function, simply declare it like this:
///
/// ```rust
-/// # #![allow(clippy::disallowed_names, clippy::new_ret_no_self)]
+/// # #![allow(clippy::disallowed_names)]
/// # use kernel::{init, pin_init, prelude::*, init::*};
/// # use core::pin::Pin;
/// # #[pin_data]
@@ -438,7 +438,7 @@ macro_rules! stack_try_pin_init {
/// Users of `Foo` can now create it like this:
///
/// ```rust
-/// # #![allow(clippy::disallowed_names, clippy::new_ret_no_self)]
+/// # #![allow(clippy::disallowed_names)]
/// # use kernel::{init, pin_init, macros::pin_data, init::*};
/// # use core::pin::Pin;
/// # #[pin_data]
@@ -466,7 +466,7 @@ macro_rules! stack_try_pin_init {
/// They can also easily embed it into their own `struct`s:
///
/// ```rust
-/// # #![allow(clippy::disallowed_names, clippy::new_ret_no_self)]
+/// # #![allow(clippy::disallowed_names)]
/// # use kernel::{init, pin_init, macros::pin_data, init::*};
/// # use core::pin::Pin;
/// # #[pin_data]
diff --git a/rust/kernel/sync/condvar.rs b/rust/kernel/sync/condvar.rs
index ed353399c4e5..b679b6f6dbeb 100644
--- a/rust/kernel/sync/condvar.rs
+++ b/rust/kernel/sync/condvar.rs
@@ -91,7 +91,6 @@ unsafe impl Sync for CondVar {}

impl CondVar {
/// Constructs a new condvar initialiser.
- #[allow(clippy::new_ret_no_self)]
pub fn new(name: &'static CStr, key: &'static LockClassKey) -> impl PinInit<Self> {
pin_init!(Self {
_pin: PhantomPinned,
diff --git a/rust/kernel/sync/lock.rs b/rust/kernel/sync/lock.rs
index 70a785f04754..f12a684bc957 100644
--- a/rust/kernel/sync/lock.rs
+++ b/rust/kernel/sync/lock.rs
@@ -99,7 +99,6 @@ unsafe impl<T: ?Sized + Send, B: Backend> Sync for Lock<T, B> {}

impl<T, B: Backend> Lock<T, B> {
/// Constructs a new lock initialiser.
- #[allow(clippy::new_ret_no_self)]
pub fn new(t: T, name: &'static CStr, key: &'static LockClassKey) -> impl PinInit<Self> {
pin_init!(Self {
data: UnsafeCell::new(t),
--
2.40.1


2023-09-23 15:07:59

by Benno Lossin

[permalink] [raw]
Subject: Re: [PATCH] rust: remove ignores for `clippy::new_ret_no_self`

On 23.09.23 04:46, Gary Guo wrote:
> The clippy false positive triggering `new_ret_no_self` lint when using
> `pin_init!` macro is fixed in 1.67, so remove all `#[allow]`s ignoring
> the lint.
>
> Signed-off-by: Gary Guo <[email protected]>
> ---

Reviewed-by: Benno Lossin <[email protected]>

2023-09-23 15:11:25

by Alice Ryhl

[permalink] [raw]
Subject: Re: [PATCH] rust: remove ignores for `clippy::new_ret_no_self`

On Sat, Sep 23, 2023 at 4:47 AM Gary Guo <[email protected]> wrote:
>
> The clippy false positive triggering `new_ret_no_self` lint when using
> `pin_init!` macro is fixed in 1.67, so remove all `#[allow]`s ignoring
> the lint.
>
> Signed-off-by: Gary Guo <[email protected]>

Reviewed-by: Alice Ryhl <[email protected]>

2023-09-23 16:16:19

by Finn Behrens

[permalink] [raw]
Subject: Re: [PATCH] rust: remove ignores for `clippy::new_ret_no_self`



On 23 Sep 2023, at 4:46, Gary Guo wrote:

> The clippy false positive triggering `new_ret_no_self` lint when using
> `pin_init!` macro is fixed in 1.67, so remove all `#[allow]`s ignoring
> the lint.
>
> Signed-off-by: Gary Guo <[email protected]>
> ---

Reviewed-by: Finn Behrens <[email protected]>

2023-09-23 16:31:55

by Benno Lossin

[permalink] [raw]
Subject: Re: [PATCH] rust: remove ignores for `clippy::new_ret_no_self`

On 23.09.23 04:46, Gary Guo wrote:
> The clippy false positive triggering `new_ret_no_self` lint when using
> `pin_init!` macro is fixed in 1.67, so remove all `#[allow]`s ignoring
> the lint.
>
> Signed-off-by: Gary Guo <[email protected]>
> ---
> rust/kernel/init.rs | 20 ++++++++++----------
> rust/kernel/sync/condvar.rs | 1 -
> rust/kernel/sync/lock.rs | 1 -
> 3 files changed, 10 insertions(+), 12 deletions(-)
>

Reviewed-by: Benno Lossin <[email protected]>

2023-09-23 16:58:59

by Miguel Ojeda

[permalink] [raw]
Subject: Re: [PATCH] rust: remove ignores for `clippy::new_ret_no_self`

On Sat, Sep 23, 2023 at 4:47 AM Gary Guo <[email protected]> wrote:
>
> The clippy false positive triggering `new_ret_no_self` lint when using
> `pin_init!` macro is fixed in 1.67, so remove all `#[allow]`s ignoring
> the lint.

+1, thanks Gary, this is one I found thanks to the `#[expect]` series
I have to send. There are a couple others that I clean up there
(`non_send_fields_in_send_ty`, `dbg_macro`). Since you sent this one,
I will take your patch :)

If you don't mind, I will reword it a bit to add the couple links I had:

rust: kernel: remove `#[allow(clippy::new_ret_no_self)]`

Since Rust 1.67.0, Clippy's `new_ret_no_self` lint learnt to not
warn about `-> impl Trait<Self>` [1][2].

The kernel is nowadays on Rust 1.71.1, thus remove the `allow`.

Link: https://github.com/rust-lang/rust-clippy/issues/7344 [1]
Link: https://github.com/rust-lang/rust-clippy/pull/9733 [2]

Cheers,
Miguel

Subject: Re: [PATCH] rust: remove ignores for `clippy::new_ret_no_self`

On 9/22/23 23:46, Gary Guo wrote:
> The clippy false positive triggering `new_ret_no_self` lint when using
> `pin_init!` macro is fixed in 1.67, so remove all `#[allow]`s ignoring
> the lint.
>
> Signed-off-by: Gary Guo <[email protected]>
> ---
> [...]
Reviewed-by: Martin Rodriguez Reboredo <[email protected]>

2023-10-05 16:46:14

by Miguel Ojeda

[permalink] [raw]
Subject: Re: [PATCH] rust: remove ignores for `clippy::new_ret_no_self`

On Sat, Sep 23, 2023 at 4:47 AM Gary Guo <[email protected]> wrote:
>
> The clippy false positive triggering `new_ret_no_self` lint when using
> `pin_init!` macro is fixed in 1.67, so remove all `#[allow]`s ignoring
> the lint.
>
> Signed-off-by: Gary Guo <[email protected]>

Applied to `rust-next` with a bit of rewording to add those two links
I mentioned -- thanks everyone!

Cheers,
Miguel