rust/drm: Fixup import styles
Subsystems (3)
PATCH v3 1/2 rust/drm: Fixup import styles
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 <[email protected]>
---
V3:
* Make sure // is on the last import item always (Gary Guo)
rust/kernel/drm/device.rs | 31 ++++++++++++++++++++++++------- rust/kernel/drm/driver.rs | 12 +++++++++--- rust/kernel/drm/file.rs | 14 +++++++++++--- rust/kernel/drm/gem/mod.rs | 25 ++++++++++++++++++++----- 4 files changed, 64 insertions(+), 18 deletions(-)
rust/kernel/drm/device.rs +24 -7
@@ -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 }, - types::Opaque , + sync::aref::{ +ARef , +AlwaysRefCounted ,// + }, + types::Opaque ,// +}; +use core::{ + alloc::Layout , + mem, + ops::Deref , + ptr::{ + self, +NonNull ,// + }, }; -use core::{alloc::Layout , mem, ops::Deref , ptr, ptr::NonNull };#[cfg( CONFIG_DRM_LEGACY )] macro_rules! drm_legacy_fields {
rust/kernel/drm/driver.rs +9 -3
@@ -5,10 +5,16 @@//! 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 , + sync::aref::ARef ,// };use macros::vtable;
rust/kernel/drm/file.rs +11 -3
@@ -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 {
rust/kernel/drm/gem/mod.rs +20 -5
@@ -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
Signature · 1 line
2.52.0
PATCH v3 2/2 rust/drm: Remove imports covered by prelude::*
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 <[email protected]>
--- rust/kernel/drm/device.rs | 5 +---- rust/kernel/drm/driver.rs | 6 +----- rust/kernel/drm/file.rs | 6 +----- rust/kernel/drm/gem/mod.rs | 6 +----- 4 files changed, 4 insertions(+), 19 deletions(-)
rust/kernel/drm/device.rs +1 -4
@@ -12,10 +12,7 @@ self, driver::AllocImpl, // }, - error::{ - from_err_ptr, - Result, // - }, + error::from_err_ptr, prelude::*, sync::aref::{ARef ,
rust/kernel/drm/driver.rs +1 -5
@@ -9,14 +9,10 @@ device, devres, drm, - error::{ - to_result, - Result, // - }, + error::to_result, prelude::*, 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;
rust/kernel/drm/file.rs +1 -5
@@ -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 {
rust/kernel/drm/gem/mod.rs +1 -5
@@ -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 ,
Signature · 1 line
2.52.0