Skip to contentSkip to conversation

Rust 'rustfmt'

GIT PULL Merged Miguel Ojeda 2 participants 2 messages Oct 18, 2025 Rust

lore
Share & tools
lore

Miguel Ojeda

author maintainer
#0 lore raw

Hi Linus,

This is the PR for:

    https://lore.kernel.org/rust-for-linux/[email protected]/

It has only been a day in linux-next, but it is trivial. I based this on a non-tag because there was one more change merged this week.

No conflicts expected. No functional changes intended.

Please pull -- thanks!

Cheers,
Miguel

The following changes since commit 98ac9cc4b4452ed7e714eddc8c90ac4ae5da1a09:

Merge tag 'f2fs-fix-6.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs (2025-10-16 10:58:49 -0700)

are available in the Git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux.git tags/rust-rustfmt

for you to fetch changes up to 1f1d3e1d094db732d22b892227bf1e1ac3a8ca04:

rust: bitmap: fix formatting (2025-10-17 13:02:22 +0200)

----------------------------------------------------------------
Rust 'rustfmt' cleanup

'rustfmt', by default, formats imports in a way that is prone to conflicts while merging and rebasing, since in some cases it condenses several items into the same line.

Document in our guidelines that we will handle this for the moment with the trailing empty comment workaround and make the tree 'rustfmt'-clean again.

----------------------------------------------------------------
Miguel Ojeda (4):
docs: rust: add section on imports formatting
rust: alloc: employ a trailing comment to keep vertical layout
rust: cpufreq: fix formatting
rust: bitmap: fix formatting

 Documentation/rust/coding-guidelines.rst | 75 ++++++++++++++++++++++++++++++++
 rust/kernel/alloc/kvec.rs                |  2 +-
 rust/kernel/bitmap.rs                    |  8 +++-
 rust/kernel/cpufreq.rs                   |  3 +-
 4 files changed, 83 insertions(+), 5 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Sat, 18 Oct 2025 20:28:00 +0200:

The pull request you sent on Sat, 18 Oct 2025 20:28:00 +0200:

Quoted 1 line

https://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux.git tags/rust-rustfmt

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1c64efcb083c48c85227cb4d72ab137feef2cdac

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html