Merge pull request #2787 from jprendes/rustfmt

Add `rustfmt.toml` to standardize formatting

.git-blame-ignore-revs

@@ -0,0 +1,6 @@
+# Ignore commits in the blame view
+# see:
+#   https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
+
+# Bulk apply formatting
+13a3fd516e9904d5cd7ef20ead76dd70cd172fe7

.github/workflows/basic.yml

@@ -44,7 +44,9 @@ jobs:
       - name: Setup Rust toolchain and cache
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          components: rustfmt, clippy
+          components: clippy
+      - name: Install nightly rustfmt
+        run: rustup toolchain install nightly --component rustfmt --profile minimal --no-self-update
       - name: typos-action
         uses: crate-ci/[email protected]
       - name: Install just

crates/libcgroups/examples/bpf.rs

@@ -2,19 +2,15 @@ use anyhow::Result;
 
 #[cfg(feature = "cgroupsv2_devices")]
 mod bpf {
-    use anyhow::{bail, Result};
-    use clap::Arg;
-    use clap::Command;
-    use oci_spec::runtime::LinuxDeviceCgroup;
     use std::os::unix::io::AsRawFd;
     use std::path::Path;
 
+    use anyhow::{bail, Result};
+    use clap::{Arg, Command};
+    use libcgroups::v2::devices::{bpf, emulator, program};
     use nix::fcntl::OFlag;
     use nix::sys::stat::Mode;
-
-    use libcgroups::v2::devices::bpf;
-    use libcgroups::v2::devices::emulator;
-    use libcgroups::v2::devices::program;
+    use oci_spec::runtime::LinuxDeviceCgroup;
 
     const LICENSE: &str = "Apache";
     fn cli() -> Command {

crates/libcgroups/src/common.rs

@@ -1,26 +1,19 @@
-use std::{
-    fmt::{Debug, Display},
-    fs::{self, File},
-    io::{BufRead, BufReader, Write},
-    path::{Path, PathBuf, StripPrefixError},
-    time::Duration,
-};
-
-use nix::{
-    sys::statfs::{statfs, CGROUP2_SUPER_MAGIC, TMPFS_MAGIC},
-    unistd::Pid,
-};
+use std::fmt::{Debug, Display};
+use std::fs::{self, File};
+use std::io::{BufRead, BufReader, Write};
+use std::path::{Path, PathBuf, StripPrefixError};
+use std::time::Duration;
+
+use nix::sys::statfs::{statfs, CGROUP2_SUPER_MAGIC, TMPFS_MAGIC};
+use nix::unistd::Pid;
 use oci_spec::runtime::LinuxResources;
 #[cfg(any(feature = "cgroupsv2_devices", feature = "v1"))]
 use oci_spec::runtime::{
     LinuxDevice, LinuxDeviceBuilder, LinuxDeviceCgroup, LinuxDeviceCgroupBuilder, LinuxDeviceType,
 };
 
-use super::systemd;
-use super::v1;
-use super::v2;
-
 use super::stats::Stats;
+use super::{systemd, v1, v2};
 
 pub const CGROUP_PROCS: &str = "cgroup.procs";
 pub const DEFAULT_CGROUP_ROOT: &str = "/sys/fs/cgroup";

crates/libcgroups/src/stats.rs

@@ -1,15 +1,13 @@
-use serde::Serialize;
-use std::{
-    collections::HashMap,
-    fmt::Display,
-    fs,
-    num::ParseIntError,
-    path::{Path, PathBuf},
-};
+use std::collections::HashMap;
+use std::fmt::Display;
+use std::fs;
+use std::num::ParseIntError;
+use std::path::{Path, PathBuf};
 
-use crate::common::{WrapIoResult, WrappedIoError};
+use serde::Serialize;
 
 use super::common;
+use crate::common::{WrapIoResult, WrappedIoError};
 
 pub(crate) trait StatsProvider {
     type Error;
@@ -475,9 +473,8 @@ fn parse_psi(stat_line: &str, path: &Path) -> Result<PSIData, WrappedIoError> {
 
 #[cfg(test)]
 mod tests {
-    use crate::test::set_fixture;
-
     use super::*;
+    use crate::test::set_fixture;
 
     #[test]
     fn test_supported_page_sizes_gigabyte() {

crates/libcgroups/src/systemd/controller.rs

@@ -1,7 +1,6 @@
 use std::collections::HashMap;
 
 use super::dbus_native::serialize::Variant;
-
 use crate::common::ControllerOpt;
 
 pub(super) trait Controller {

crates/libcgroups/src/systemd/cpu.rs

@@ -1,9 +1,9 @@
 use std::collections::HashMap;
 
-use super::dbus_native::serialize::Variant;
 use oci_spec::runtime::LinuxCpu;
 
 use super::controller::Controller;
+use super::dbus_native::serialize::Variant;
 use crate::common::ControllerOpt;
 
 pub const CPU_WEIGHT: &str = "CPUWeight";
@@ -95,9 +95,8 @@ mod tests {
     use oci_spec::runtime::LinuxCpuBuilder;
 
     use super::super::dbus_native::serialize::DbusSerialize;
-    use crate::recast;
-
     use super::*;
+    use crate::recast;
 
     #[test]
     fn test_set_shares() -> Result<()> {

crates/libcgroups/src/systemd/cpuset.rs

@@ -1,12 +1,11 @@
 use std::collections::HashMap;
 
-use super::dbus_native::serialize::Variant;
 use fixedbitset::FixedBitSet;
 use oci_spec::runtime::LinuxCpu;
 
-use crate::common::ControllerOpt;
-
 use super::controller::Controller;
+use super::dbus_native::serialize::Variant;
+use crate::common::ControllerOpt;
 
 pub const ALLOWED_CPUS: &str = "AllowedCPUs";
 pub const ALLOWED_NODES: &str = "AllowedMemoryNodes";
@@ -139,9 +138,8 @@ mod tests {
     use oci_spec::runtime::LinuxCpuBuilder;
 
     use super::super::dbus_native::serialize::DbusSerialize;
-    use crate::recast;
-
     use super::*;
+    use crate::recast;
 
     #[test]
     fn to_bitmask_single_value() -> Result<()> {

crates/libcgroups/src/systemd/dbus_native/client.rs

@@ -1,7 +1,9 @@
-use super::{serialize::Variant, utils::SystemdClientError};
 use std::collections::HashMap;
 use std::path::PathBuf;
 
+use super::serialize::Variant;
+use super::utils::SystemdClientError;
+
 pub trait SystemdClient {
     fn is_system(&self) -> bool;
 

crates/libcgroups/src/systemd/dbus_native/dbus.rs

@@ -1,16 +1,17 @@
-use crate::systemd::dbus_native::serialize::{DbusSerialize, Structure, Variant};
-
-use super::client::SystemdClient;
-use super::message::*;
-use super::proxy::Proxy;
-use super::utils::{DbusError, Result, SystemdClientError};
-use nix::sys::socket;
 use std::collections::HashMap;
 use std::io::{IoSlice, IoSliceMut};
 use std::os::fd::AsRawFd;
 use std::path::PathBuf;
 use std::sync::atomic::{AtomicU32, Ordering};
 
+use nix::sys::socket;
+
+use super::client::SystemdClient;
+use super::message::*;
+use super::proxy::Proxy;
+use super::utils::{DbusError, Result, SystemdClientError};
+use crate::systemd::dbus_native::serialize::{DbusSerialize, Structure, Variant};
+
 const REPLY_BUF_SIZE: usize = 128; // seems good enough tradeoff between extra size and repeated calls
 
 /// NOTE that this is meant for a single-threaded use, and concurrent
@@ -461,9 +462,10 @@ impl SystemdClient for DbusConnection {
 
 #[cfg(test)]
 mod tests {
+    use nix::unistd::getuid;
+
     use super::super::utils::Result;
     use super::{uid_to_hex_str, DbusConnection, SystemdClientError};
-    use nix::unistd::getuid;
 
     #[test]
     fn test_uid_to_hex_str() {

crates/libcgroups/src/systemd/dbus_native/message.rs

@@ -489,11 +489,9 @@ impl Message {
 
 #[cfg(test)]
 mod tests {
-    use crate::systemd::dbus_native::serialize::{Structure, Variant};
-
     use super::super::serialize::DbusSerialize;
-    use super::{Header, HeaderKind, HeaderValue, MessageType};
-    use super::{Message, Result};
+    use super::{Header, HeaderKind, HeaderValue, Message, MessageType, Result};
+    use crate::systemd::dbus_native::serialize::{Structure, Variant};
     // The hardcoded serialized values are captured from
     // original dbus library communication
     // and manually decoded.

crates/libcgroups/src/systemd/manager.rs

@@ -1,32 +1,30 @@
-use std::{
-    collections::HashMap,
-    convert::Infallible,
-    fmt::{Debug, Display},
-    fs::{self},
-    path::Component::RootDir,
-};
-
-use nix::{unistd::Pid, NixPath};
+use std::collections::HashMap;
+use std::convert::Infallible;
+use std::fmt::{Debug, Display};
+use std::fs::{self};
+use std::path::Component::RootDir;
 use std::path::{Path, PathBuf};
 
-use super::{
-    controller::Controller,
-    controller_type::{ControllerType, CONTROLLER_TYPES},
-    cpu::Cpu,
-    cpuset::CpuSet,
-    dbus_native::{client::SystemdClient, dbus::DbusConnection, utils::SystemdClientError},
-    memory::Memory,
-    pids::Pids,
-};
-use crate::{
-    common::{
-        self, AnyCgroupManager, CgroupManager, ControllerOpt, FreezerState, JoinSafelyError,
-        PathBufExt, WrapIoResult, WrappedIoError,
-    },
-    systemd::{dbus_native::serialize::Variant, unified::Unified},
-    v2::manager::V2ManagerError,
+use nix::unistd::Pid;
+use nix::NixPath;
+
+use super::controller::Controller;
+use super::controller_type::{ControllerType, CONTROLLER_TYPES};
+use super::cpu::Cpu;
+use super::cpuset::CpuSet;
+use super::dbus_native::client::SystemdClient;
+use super::dbus_native::dbus::DbusConnection;
+use super::dbus_native::utils::SystemdClientError;
+use super::memory::Memory;
+use super::pids::Pids;
+use crate::common::{
+    self, AnyCgroupManager, CgroupManager, ControllerOpt, FreezerState, JoinSafelyError,
+    PathBufExt, WrapIoResult, WrappedIoError,
 };
-use crate::{stats::Stats, v2::manager::Manager as FsManager};
+use crate::stats::Stats;
+use crate::systemd::dbus_native::serialize::Variant;
+use crate::systemd::unified::Unified;
+use crate::v2::manager::{Manager as FsManager, V2ManagerError};
 
 const CGROUP_CONTROLLERS: &str = "cgroup.controllers";
 const CGROUP_SUBTREE_CONTROL: &str = "cgroup.subtree_control";
@@ -436,12 +434,10 @@ mod tests {
     use anyhow::{Context, Result};
 
     use super::*;
-    use crate::{
-        common::DEFAULT_CGROUP_ROOT,
-        systemd::dbus_native::{
-            client::SystemdClient, serialize::Variant, utils::SystemdClientError,
-        },
-    };
+    use crate::common::DEFAULT_CGROUP_ROOT;
+    use crate::systemd::dbus_native::client::SystemdClient;
+    use crate::systemd::dbus_native::serialize::Variant;
+    use crate::systemd::dbus_native::utils::SystemdClientError;
 
     struct TestSystemdClient {}
 

crates/libcgroups/src/systemd/memory.rs

@@ -1,11 +1,10 @@
 use std::collections::HashMap;
 
-use super::dbus_native::serialize::Variant;
 use oci_spec::runtime::LinuxMemory;
 
-use crate::common::ControllerOpt;
-
 use super::controller::Controller;
+use super::dbus_native::serialize::Variant;
+use crate::common::ControllerOpt;
 
 pub const MEMORY_MIN: &str = "MemoryMin";
 pub const MEMORY_LOW: &str = "MemoryLow";
@@ -118,9 +117,8 @@ mod tests {
     use oci_spec::runtime::LinuxMemoryBuilder;
 
     use super::super::dbus_native::serialize::DbusSerialize;
-    use crate::recast;
-
     use super::*;
+    use crate::recast;
 
     #[test]
     fn test_set_valid_memory_low() -> Result<()> {

crates/libcgroups/src/systemd/pids.rs

@@ -1,11 +1,11 @@
-use std::{collections::HashMap, convert::Infallible};
+use std::collections::HashMap;
+use std::convert::Infallible;
 
-use super::dbus_native::serialize::Variant;
 use oci_spec::runtime::LinuxPids;
 
-use crate::common::ControllerOpt;
-
 use super::controller::Controller;
+use super::dbus_native::serialize::Variant;
+use crate::common::ControllerOpt;
 
 pub const TASKS_MAX: &str = "TasksMax";
 
@@ -43,13 +43,13 @@ impl Pids {
 #[cfg(test)]
 mod tests {
 
-    use super::super::dbus_native::serialize::DbusSerialize;
-    use crate::recast;
-
-    use super::*;
     use anyhow::{anyhow, Context, Result};
     use oci_spec::runtime::{LinuxPidsBuilder, LinuxResources, LinuxResourcesBuilder};
 
+    use super::super::dbus_native::serialize::DbusSerialize;
+    use super::*;
+    use crate::recast;
+
     fn setup(resources: &LinuxResources) -> (ControllerOpt, HashMap<&str, Variant>) {
         let properties = HashMap::new();
         let options = ControllerOpt {

crates/libcgroups/src/systemd/unified.rs

@@ -1,12 +1,11 @@
+use std::collections::HashMap;
+use std::num::ParseIntError;
+
+use super::controller::Controller;
+use super::cpu::{self, convert_shares_to_cgroup2};
+use super::cpuset::{self, to_bitmask, BitmaskError};
 use super::dbus_native::serialize::Variant;
-use std::{collections::HashMap, num::ParseIntError};
-
-use super::{
-    controller::Controller,
-    cpu::{self, convert_shares_to_cgroup2},
-    cpuset::{self, to_bitmask, BitmaskError},
-    memory, pids,
-};
+use super::{memory, pids};
 use crate::common::ControllerOpt;
 
 #[derive(thiserror::Error, Debug)]
@@ -155,12 +154,11 @@ impl Unified {
 
 #[cfg(test)]
 mod tests {
-    use super::super::dbus_native::serialize::DbusSerialize;
     use anyhow::{Context, Result};
 
-    use crate::recast;
-
+    use super::super::dbus_native::serialize::DbusSerialize;
     use super::*;
+    use crate::recast;
 
     #[test]
     fn test_set() -> Result<()> {