* [PATCH v2 1/2] rust/drm: Fixup import styles
@ 2026-01-22 21:43 Lyude Paul
2026-01-22 21:43 ` [PATCH v2 2/2] rust/drm: Remove imports covered by prelude::* Lyude Paul
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Lyude Paul @ 2026-01-22 21:43 UTC (permalink / raw)
To: linux-kernel, dri-devel, rust-for-linux, Danilo Krummrich
Cc: Ewan Chorynski, Miguel Ojeda, Alice Ryhl, Simona Vetter,
Shankari Anand, David Airlie, Atharv Dubey, Asahi Lina,
Daniel Almeida, Lyude Paul
This is to match
https://docs.kernel.org/rust/coding-guidelines.html#imports
There should be no functional changes in this patch.
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
rust/kernel/drm/device.rs | 29 +++++++++++++++++++++++------
rust/kernel/drm/driver.rs | 10 ++++++++--
rust/kernel/drm/file.rs | 14 +++++++++++---
rust/kernel/drm/gem/mod.rs | 25 ++++++++++++++++++++-----
4 files changed, 62 insertions(+), 16 deletions(-)
diff --git a/rust/kernel/drm/device.rs b/rust/kernel/drm/device.rs
index 3ce8f62a00569..23c457c90a6ab 100644
--- a/rust/kernel/drm/device.rs
+++ b/rust/kernel/drm/device.rs
@@ -6,15 +6,32 @@
use crate::{
alloc::allocator::Kmalloc,
- bindings, device, drm,
- drm::driver::AllocImpl,
- error::from_err_ptr,
- error::Result,
+ bindings,
+ device, //
+ drm::{
+ self,
+ driver::AllocImpl, //
+ },
+ error::{
+ from_err_ptr,
+ Result, //
+ },
prelude::*,
- sync::aref::{ARef, AlwaysRefCounted},
+ sync::aref::{
+ ARef,
+ AlwaysRefCounted, //
+ },
types::Opaque,
};
-use core::{alloc::Layout, mem, ops::Deref, ptr, ptr::NonNull};
+use core::{
+ alloc::Layout,
+ mem,
+ ops::Deref,
+ ptr::{
+ self,
+ NonNull, //
+ },
+};
#[cfg(CONFIG_DRM_LEGACY)]
macro_rules! drm_legacy_fields {
diff --git a/rust/kernel/drm/driver.rs b/rust/kernel/drm/driver.rs
index f30ee4c6245cd..c8ec5c0819a06 100644
--- a/rust/kernel/drm/driver.rs
+++ b/rust/kernel/drm/driver.rs
@@ -5,8 +5,14 @@
//! C header: [`include/drm/drm_drv.h`](srctree/include/drm/drm_drv.h)
use crate::{
- bindings, device, devres, drm,
- error::{to_result, Result},
+ bindings,
+ device,
+ devres,
+ drm, //
+ error::{
+ to_result,
+ Result, //
+ },
prelude::*,
sync::aref::ARef,
};
diff --git a/rust/kernel/drm/file.rs b/rust/kernel/drm/file.rs
index 8c46f8d519516..7dade6dfa1ba2 100644
--- a/rust/kernel/drm/file.rs
+++ b/rust/kernel/drm/file.rs
@@ -4,9 +4,17 @@
//!
//! C header: [`include/drm/drm_file.h`](srctree/include/drm/drm_file.h)
-use crate::{bindings, drm, error::Result, prelude::*, types::Opaque};
-use core::marker::PhantomData;
-use core::pin::Pin;
+use crate::{
+ bindings,
+ drm,
+ error::Result,
+ prelude::*,
+ types::Opaque, //
+};
+use core::{
+ marker::PhantomData,
+ pin::Pin, //
+};
/// Trait that must be implemented by DRM drivers to represent a DRM File (a client instance).
pub trait DriverFile {
diff --git a/rust/kernel/drm/gem/mod.rs b/rust/kernel/drm/gem/mod.rs
index d49a9ba026356..56b7641b1405e 100644
--- a/rust/kernel/drm/gem/mod.rs
+++ b/rust/kernel/drm/gem/mod.rs
@@ -6,14 +6,29 @@
use crate::{
alloc::flags::*,
- bindings, drm,
- drm::driver::{AllocImpl, AllocOps},
- error::{to_result, Result},
+ bindings,
+ drm::{
+ self,
+ driver::{
+ AllocImpl,
+ AllocOps, //
+ },
+ },
+ error::{
+ to_result,
+ Result, //
+ },
prelude::*,
- sync::aref::{ARef, AlwaysRefCounted},
+ sync::aref::{
+ ARef,
+ AlwaysRefCounted, //
+ },
types::Opaque,
};
-use core::{ops::Deref, ptr::NonNull};
+use core::{
+ ops::Deref,
+ ptr::NonNull, //
+};
/// A type alias for retrieving a [`Driver`]s [`DriverFile`] implementation from its
/// [`DriverObject`] implementation.
base-commit: 6ea52b6d8f33ae627f4dcf43b12b6e713a8b9331
--
2.52.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] rust/drm: Remove imports covered by prelude::*
2026-01-22 21:43 [PATCH v2 1/2] rust/drm: Fixup import styles Lyude Paul
@ 2026-01-22 21:43 ` Lyude Paul
2026-02-24 15:17 ` Danilo Krummrich
2026-01-22 23:04 ` [PATCH v2 1/2] rust/drm: Fixup import styles Gary Guo
2026-02-24 15:17 ` Danilo Krummrich
2 siblings, 1 reply; 5+ messages in thread
From: Lyude Paul @ 2026-01-22 21:43 UTC (permalink / raw)
To: linux-kernel, dri-devel, rust-for-linux, Danilo Krummrich
Cc: Ewan Chorynski, Miguel Ojeda, Alice Ryhl, Simona Vetter,
Shankari Anand, David Airlie, Asahi Lina, Daniel Almeida,
Lyude Paul
This just removes any explicit imports of items in files that are already
being pulled in by `use prelude::*;`.
There should be no functional changes in this patch.
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
rust/kernel/drm/device.rs | 5 +----
rust/kernel/drm/driver.rs | 10 +++-------
rust/kernel/drm/file.rs | 6 +-----
rust/kernel/drm/gem/mod.rs | 6 +-----
4 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/rust/kernel/drm/device.rs b/rust/kernel/drm/device.rs
index 23c457c90a6ab..30116d78cabe0 100644
--- a/rust/kernel/drm/device.rs
+++ b/rust/kernel/drm/device.rs
@@ -12,10 +12,7 @@
self,
driver::AllocImpl, //
},
- error::{
- from_err_ptr,
- Result, //
- },
+ error::from_err_ptr,
prelude::*,
sync::aref::{
ARef,
diff --git a/rust/kernel/drm/driver.rs b/rust/kernel/drm/driver.rs
index c8ec5c0819a06..2940fece7d59e 100644
--- a/rust/kernel/drm/driver.rs
+++ b/rust/kernel/drm/driver.rs
@@ -8,15 +8,11 @@
bindings,
device,
devres,
- drm, //
- error::{
- to_result,
- Result, //
- },
+ drm,
+ error::to_result,
prelude::*,
- sync::aref::ARef,
+ sync::aref::ARef, //
};
-use macros::vtable;
/// Driver use the GEM memory manager. This should be set for all modern drivers.
pub(crate) const FEAT_GEM: u32 = bindings::drm_driver_feature_DRIVER_GEM;
diff --git a/rust/kernel/drm/file.rs b/rust/kernel/drm/file.rs
index 7dade6dfa1ba2..10160601ce5af 100644
--- a/rust/kernel/drm/file.rs
+++ b/rust/kernel/drm/file.rs
@@ -7,14 +7,10 @@
use crate::{
bindings,
drm,
- error::Result,
prelude::*,
types::Opaque, //
};
-use core::{
- marker::PhantomData,
- pin::Pin, //
-};
+use core::marker::PhantomData;
/// Trait that must be implemented by DRM drivers to represent a DRM File (a client instance).
pub trait DriverFile {
diff --git a/rust/kernel/drm/gem/mod.rs b/rust/kernel/drm/gem/mod.rs
index 56b7641b1405e..b4199945db378 100644
--- a/rust/kernel/drm/gem/mod.rs
+++ b/rust/kernel/drm/gem/mod.rs
@@ -5,7 +5,6 @@
//! C header: [`include/drm/drm_gem.h`](srctree/include/drm/drm_gem.h)
use crate::{
- alloc::flags::*,
bindings,
drm::{
self,
@@ -14,10 +13,7 @@
AllocOps, //
},
},
- error::{
- to_result,
- Result, //
- },
+ error::to_result,
prelude::*,
sync::aref::{
ARef,
--
2.52.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] rust/drm: Fixup import styles
2026-01-22 21:43 [PATCH v2 1/2] rust/drm: Fixup import styles Lyude Paul
2026-01-22 21:43 ` [PATCH v2 2/2] rust/drm: Remove imports covered by prelude::* Lyude Paul
@ 2026-01-22 23:04 ` Gary Guo
2026-02-24 15:17 ` Danilo Krummrich
2 siblings, 0 replies; 5+ messages in thread
From: Gary Guo @ 2026-01-22 23:04 UTC (permalink / raw)
To: Lyude Paul, linux-kernel, dri-devel, rust-for-linux,
Danilo Krummrich
Cc: Ewan Chorynski, Miguel Ojeda, Alice Ryhl, Simona Vetter,
Shankari Anand, David Airlie, Atharv Dubey, Asahi Lina,
Daniel Almeida
On Thu Jan 22, 2026 at 9:43 PM GMT, Lyude Paul wrote:
> This is to match
> https://docs.kernel.org/rust/coding-guidelines.html#imports
>
> There should be no functional changes in this patch.
>
> Signed-off-by: Lyude Paul <lyude@redhat.com>
> ---
> rust/kernel/drm/device.rs | 29 +++++++++++++++++++++++------
> rust/kernel/drm/driver.rs | 10 ++++++++--
> rust/kernel/drm/file.rs | 14 +++++++++++---
> rust/kernel/drm/gem/mod.rs | 25 ++++++++++++++++++++-----
> 4 files changed, 62 insertions(+), 16 deletions(-)
>
> diff --git a/rust/kernel/drm/device.rs b/rust/kernel/drm/device.rs
> index 3ce8f62a00569..23c457c90a6ab 100644
> --- a/rust/kernel/drm/device.rs
> +++ b/rust/kernel/drm/device.rs
> @@ -6,15 +6,32 @@
>
> use crate::{
> alloc::allocator::Kmalloc,
> - bindings, device, drm,
> - drm::driver::AllocImpl,
> - error::from_err_ptr,
> - error::Result,
> + bindings,
> + device, //
I think this // is supposed to go to the last item in the import?
Best,
Gary
> + drm::{
> + self,
> + driver::AllocImpl, //
> + },
> + error::{
> + from_err_ptr,
> + Result, //
> + },
> prelude::*,
> - sync::aref::{ARef, AlwaysRefCounted},
> + sync::aref::{
> + ARef,
> + AlwaysRefCounted, //
> + },
> types::Opaque,
> };
> -use core::{alloc::Layout, mem, ops::Deref, ptr, ptr::NonNull};
> +use core::{
> + alloc::Layout,
> + mem,
> + ops::Deref,
> + ptr::{
> + self,
> + NonNull, //
> + },
> +};
>
> #[cfg(CONFIG_DRM_LEGACY)]
> macro_rules! drm_legacy_fields {
> diff --git a/rust/kernel/drm/driver.rs b/rust/kernel/drm/driver.rs
> index f30ee4c6245cd..c8ec5c0819a06 100644
> --- a/rust/kernel/drm/driver.rs
> +++ b/rust/kernel/drm/driver.rs
> @@ -5,8 +5,14 @@
> //! C header: [`include/drm/drm_drv.h`](srctree/include/drm/drm_drv.h)
>
> use crate::{
> - bindings, device, devres, drm,
> - error::{to_result, Result},
> + bindings,
> + device,
> + devres,
> + drm, //
> + error::{
> + to_result,
> + Result, //
> + },
> prelude::*,
> sync::aref::ARef,
> };
> diff --git a/rust/kernel/drm/file.rs b/rust/kernel/drm/file.rs
> index 8c46f8d519516..7dade6dfa1ba2 100644
> --- a/rust/kernel/drm/file.rs
> +++ b/rust/kernel/drm/file.rs
> @@ -4,9 +4,17 @@
> //!
> //! C header: [`include/drm/drm_file.h`](srctree/include/drm/drm_file.h)
>
> -use crate::{bindings, drm, error::Result, prelude::*, types::Opaque};
> -use core::marker::PhantomData;
> -use core::pin::Pin;
> +use crate::{
> + bindings,
> + drm,
> + error::Result,
> + prelude::*,
> + types::Opaque, //
> +};
> +use core::{
> + marker::PhantomData,
> + pin::Pin, //
> +};
>
> /// Trait that must be implemented by DRM drivers to represent a DRM File (a client instance).
> pub trait DriverFile {
> diff --git a/rust/kernel/drm/gem/mod.rs b/rust/kernel/drm/gem/mod.rs
> index d49a9ba026356..56b7641b1405e 100644
> --- a/rust/kernel/drm/gem/mod.rs
> +++ b/rust/kernel/drm/gem/mod.rs
> @@ -6,14 +6,29 @@
>
> use crate::{
> alloc::flags::*,
> - bindings, drm,
> - drm::driver::{AllocImpl, AllocOps},
> - error::{to_result, Result},
> + bindings,
> + drm::{
> + self,
> + driver::{
> + AllocImpl,
> + AllocOps, //
> + },
> + },
> + error::{
> + to_result,
> + Result, //
> + },
> prelude::*,
> - sync::aref::{ARef, AlwaysRefCounted},
> + sync::aref::{
> + ARef,
> + AlwaysRefCounted, //
> + },
> types::Opaque,
> };
> -use core::{ops::Deref, ptr::NonNull};
> +use core::{
> + ops::Deref,
> + ptr::NonNull, //
> +};
>
> /// A type alias for retrieving a [`Driver`]s [`DriverFile`] implementation from its
> /// [`DriverObject`] implementation.
>
> base-commit: 6ea52b6d8f33ae627f4dcf43b12b6e713a8b9331
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] rust/drm: Fixup import styles
2026-01-22 21:43 [PATCH v2 1/2] rust/drm: Fixup import styles Lyude Paul
2026-01-22 21:43 ` [PATCH v2 2/2] rust/drm: Remove imports covered by prelude::* Lyude Paul
2026-01-22 23:04 ` [PATCH v2 1/2] rust/drm: Fixup import styles Gary Guo
@ 2026-02-24 15:17 ` Danilo Krummrich
2 siblings, 0 replies; 5+ messages in thread
From: Danilo Krummrich @ 2026-02-24 15:17 UTC (permalink / raw)
To: Lyude Paul
Cc: linux-kernel, dri-devel, rust-for-linux, Ewan Chorynski,
Miguel Ojeda, Alice Ryhl, Simona Vetter, Shankari Anand,
David Airlie, Atharv Dubey, Asahi Lina, Daniel Almeida
On 1/22/26 10:43 PM, Lyude Paul wrote:
> This is to match
> https://docs.kernel.org/rust/coding-guidelines.html#imports
>
> There should be no functional changes in this patch.
>
> Signed-off-by: Lyude Paul <lyude@redhat.com>
Applied to drm-rust-next, thanks!
[ Move trailing `//` at the end. - Danilo ]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 2/2] rust/drm: Remove imports covered by prelude::*
2026-01-22 21:43 ` [PATCH v2 2/2] rust/drm: Remove imports covered by prelude::* Lyude Paul
@ 2026-02-24 15:17 ` Danilo Krummrich
0 siblings, 0 replies; 5+ messages in thread
From: Danilo Krummrich @ 2026-02-24 15:17 UTC (permalink / raw)
To: Lyude Paul
Cc: linux-kernel, dri-devel, rust-for-linux, Ewan Chorynski,
Miguel Ojeda, Alice Ryhl, Simona Vetter, Shankari Anand,
David Airlie, Asahi Lina, Daniel Almeida
On 1/22/26 10:43 PM, Lyude Paul wrote:
> This just removes any explicit imports of items in files that are already
> being pulled in by `use prelude::*;`.
>
> There should be no functional changes in this patch.
>
> Signed-off-by: Lyude Paul <lyude@redhat.com>
Applied to drm-rust-next, thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2026-02-24 15:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-01-22 21:43 [PATCH v2 1/2] rust/drm: Fixup import styles Lyude Paul
2026-01-22 21:43 ` [PATCH v2 2/2] rust/drm: Remove imports covered by prelude::* Lyude Paul
2026-02-24 15:17 ` Danilo Krummrich
2026-01-22 23:04 ` [PATCH v2 1/2] rust/drm: Fixup import styles Gary Guo
2026-02-24 15:17 ` Danilo Krummrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox