rust: re-order exports to fix rustfmt

[PATCH] rust: re-order exports to fix rustfmt

Posted by Tudor Gheorghiu 1 month, 4 weeks ago

In the recent rust-6.12 tag merge at 570172569238, the rbtree export was
added after the sizes export, thus breaking rustfmt's alphabetical
export ordering rules.

Signed-off-by: Tudor Gheorghiu <tudor.reda@gmail.com>
---
 rust/kernel/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
index 22a3bfa5a9e9..b5f4b3ce6b48 100644
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@ -44,8 +44,8 @@
 pub mod page;
 pub mod prelude;
 pub mod print;
-pub mod sizes;
 pub mod rbtree;
+pub mod sizes;
 mod static_assert;
 #[doc(hidden)]
 pub mod std_vendor;
-- 
2.43.0

Re: [PATCH] rust: re-order exports to fix rustfmt

Posted by Dirk Behme 1 month, 4 weeks ago

On 30.09.2024 03:09, Tudor Gheorghiu wrote:
> In the recent rust-6.12 tag merge at 570172569238, the rbtree export was
> added after the sizes export, thus breaking rustfmt's alphabetical
> export ordering rules.
> 
> Signed-off-by: Tudor Gheorghiu <tudor.reda@gmail.com>
> ---
>   rust/kernel/lib.rs | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
> index 22a3bfa5a9e9..b5f4b3ce6b48 100644
> --- a/rust/kernel/lib.rs
> +++ b/rust/kernel/lib.rs
> @@ -44,8 +44,8 @@
>   pub mod page;
>   pub mod prelude;
>   pub mod print;
> -pub mod sizes;
>   pub mod rbtree;
> +pub mod sizes;
>   mod static_assert;
>   #[doc(hidden)]

I think we have that in rust-fixes already:

https://github.com/Rust-for-Linux/linux/commit/ece207a83e464af710d641f29e32b7a144c48e79

Dirk

Re: [PATCH] rust: re-order exports to fix rustfmt

Posted by Tudor Gheorghiu 1 month, 4 weeks ago

On Mon, Sep 30, 2024 at 06:15:32AM +0200, Dirk Behme wrote:
> On 30.09.2024 03:09, Tudor Gheorghiu wrote:
> > In the recent rust-6.12 tag merge at 570172569238, the rbtree export was
> > added after the sizes export, thus breaking rustfmt's alphabetical
> > export ordering rules.
> > 
> > Signed-off-by: Tudor Gheorghiu <tudor.reda@gmail.com>
> > ---
> >   rust/kernel/lib.rs | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
> > index 22a3bfa5a9e9..b5f4b3ce6b48 100644
> > --- a/rust/kernel/lib.rs
> > +++ b/rust/kernel/lib.rs
> > @@ -44,8 +44,8 @@
> >   pub mod page;
> >   pub mod prelude;
> >   pub mod print;
> > -pub mod sizes;
> >   pub mod rbtree;
> > +pub mod sizes;
> >   mod static_assert;
> >   #[doc(hidden)]
> 
> I think we have that in rust-fixes already:
> 
> https://github.com/Rust-for-Linux/linux/commit/ece207a83e464af710d641f29e32b7a144c48e79
> 
> Dirk
> 

You are correct! I didn't check rust-fixes, as I was working on
something else when I noticed this.

Thanks!

Have a great day!
Tudor