treewide: group import statements std, external, crate

.github/workflows/rust.yml

@@ -53,5 +53,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: rustup toolchain install stable
-      - run: cargo fmt --all -- --check
+      - run: rustup toolchain install nightly
+      - run: rustup component add --toolchain nightly rustfmt
+      - run: cargo +nightly fmt --all -- --check

rustfmt.toml

@@ -0,0 +1 @@
+group_imports = "StdExternalCrate" # requires nightly toolchain: cargo +nightly fmt

src/cmdline.rs

@@ -1,7 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
-use crate::{read_file, Result};
+
 use nix::mount::MsFlags;
 
+use crate::{read_file, Result};
+
 #[derive(Debug, PartialEq)]
 pub struct CmdlineOptions {
     pub root: Option<String>,

src/dmverity.rs

@@ -1,15 +1,18 @@
 // SPDX-License-Identifier: GPL-2.0-only
-use crate::cmdline::CmdlineOptions;
-use crate::{read_file, Result};
+
+use std::fs::OpenOptions;
+use std::mem::size_of;
+use std::os::fd::IntoRawFd;
+use std::path::Path;
+
 use getrandom::getrandom;
 use log::debug;
 use nix::ioctl_readwrite;
 use nix::libc::dev_t;
 use nix::sys::stat::minor;
-use std::fs::OpenOptions;
-use std::mem::size_of;
-use std::os::fd::IntoRawFd;
-use std::path::Path;
+
+use crate::cmdline::CmdlineOptions;
+use crate::{read_file, Result};
 
 const DM_VERSION_MAJOR: u32 = 4;
 

src/main.rs

@@ -1,13 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-use cmdline::{parse_cmdline, CmdlineOptions};
-#[cfg(feature = "dmverity")]
-use dmverity::prepare_dmverity;
-use log::{debug, Level, LevelFilter, Metadata, Record};
-use mount::{mount_move_special, mount_root, mount_special};
-#[cfg(feature = "reboot-on-failure")]
-use nix::sys::reboot::{reboot, RebootMode};
-use nix::sys::termios::tcdrain;
-use nix::unistd::{chdir, chroot, dup2, execv, unlink};
+
 use std::borrow::Borrow;
 use std::env;
 use std::env::current_exe;
@@ -19,6 +11,16 @@ use std::io::Write as _;
 use std::os::fd::{AsFd, AsRawFd, RawFd};
 use std::os::unix::ffi::OsStrExt;
 use std::panic::set_hook;
+
+use cmdline::{parse_cmdline, CmdlineOptions};
+#[cfg(feature = "dmverity")]
+use dmverity::prepare_dmverity;
+use log::{debug, Level, LevelFilter, Metadata, Record};
+use mount::{mount_move_special, mount_root, mount_special};
+#[cfg(feature = "reboot-on-failure")]
+use nix::sys::reboot::{reboot, RebootMode};
+use nix::sys::termios::tcdrain;
+use nix::unistd::{chdir, chroot, dup2, execv, unlink};
 #[cfg(feature = "systemd")]
 use systemd::{mount_systemd, shutdown};
 #[cfg(feature = "usb9pfs")]

src/mount.rs

@@ -1,11 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0-only
-use crate::cmdline::CmdlineOptions;
-use crate::{mkdir, Result};
-use log::debug;
-use nix::mount::{mount, MsFlags};
+
 use std::fs::remove_dir;
 use std::path::Path;
 
+use log::debug;
+use nix::mount::{mount, MsFlags};
+
+use crate::cmdline::CmdlineOptions;
+use crate::{mkdir, Result};
+
 pub fn do_mount(
     src: Option<&str>,
     dst: &str,

src/systemd.rs

@@ -1,14 +1,17 @@
 // SPDX-License-Identifier: GPL-2.0-only
-use crate::cmdline::CmdlineOptions;
-use crate::mount::do_mount;
-use crate::{mkdir, Result};
-use nix::mount::{umount, MsFlags};
-use nix::sys::reboot::{reboot, RebootMode};
+
 use std::collections::BinaryHeap;
 use std::env;
 use std::fs::read_to_string;
 use std::path::Path;
 
+use nix::mount::{umount, MsFlags};
+use nix::sys::reboot::{reboot, RebootMode};
+
+use crate::cmdline::CmdlineOptions;
+use crate::mount::do_mount;
+use crate::{mkdir, Result};
+
 pub fn mount_systemd(options: &mut CmdlineOptions) -> Result<()> {
     do_mount(
         Option::<&str>::None,

src/usbg_9pfs.rs

@@ -1,13 +1,16 @@
 // SPDX-License-Identifier: GPL-2.0-only
-use crate::cmdline::CmdlineOptions;
-use crate::mount::mount_apivfs;
-use crate::{mkdir, Result};
-use log::debug;
+
 use std::fs::{read_dir, write};
 use std::os::unix::ffi::OsStrExt;
 use std::os::unix::fs::symlink;
 use std::{thread, time};
 
+use log::debug;
+
+use crate::cmdline::CmdlineOptions;
+use crate::mount::mount_apivfs;
+use crate::{mkdir, Result};
+
 fn write_file<C: AsRef<[u8]>>(path: &str, content: C) -> Result<()> {
     write(path, content).map_err(|e| format!("Failed to write to {path}: {e}").into())
 }