style: format Cargo files

Author: mkroening

.github/workflows/ci.yml

@@ -69,12 +69,14 @@ jobs:
     name: Format
     runs-on: ubuntu-latest
     steps:
+      - uses: dtolnay/rust-toolchain@stable
+      - run: cargo install cargo-cargofmt
       - uses: actions/checkout@v6
       - uses: mkroening/rust-toolchain-toml@main
       - run: rustup component add rustfmt
       - run: |
-          cargo fmt --all --check
-          cargo fmt --all --check --manifest-path hermit-builtins/Cargo.toml
+          cargo cargofmt --all --check
+          cargo cargofmt --all --check --manifest-path hermit-builtins/Cargo.toml
 
   lock-file:
     name: Lock file

Cargo.toml

@@ -34,11 +34,28 @@ name = "measure_startup_time"
 harness = false
 
 [features]
-default = ["kernel-stack", "pci", "pci-ids", "acpi", "fsgsbase", "smp", "tcp", "dhcpv4", "virtio-fs", "virtio-net", "virtio-vsock"]
+default = [
+	"kernel-stack",
+	"pci",
+	"pci-ids",
+	"acpi",
+	"fsgsbase",
+	"smp",
+	"tcp",
+	"dhcpv4",
+	"virtio-fs",
+	"virtio-net",
+	"virtio-vsock",
+]
 acpi = []
 alloc-stats = ["talc/counters"]
 common-os = []
-dhcpv4 = ["net", "smoltcp", "smoltcp/proto-dhcpv4", "smoltcp/socket-dhcpv4"]
+dhcpv4 = [
+	"net",
+	"smoltcp",
+	"smoltcp/proto-dhcpv4",
+	"smoltcp/socket-dhcpv4",
+]
 dns = ["net", "smoltcp", "smoltcp/socket-dns"]
 fsgsbase = []
 gem-net = ["net", "dep:tock-registers"]
@@ -75,7 +92,7 @@ vsock = ["virtio-vsock"]
 
 [lints.rust]
 rust_2018_idioms = "warn"
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(careful)'] }
+unexpected_cfgs = { level = "warn", check-cfg = ["cfg(careful)"] }
 unsafe_op_in_unsafe_fn = "warn"
 
 [lints.clippy]
@@ -153,14 +170,9 @@ features = [
 	"async",
 	"medium-ethernet",
 	"proto-ipv4",
-	"proto-ipv6",
-	# Enable IP fragmentation
+	"proto-ipv6", # Enable IP fragmentation
 	"proto-ipv4-fragmentation",
-	"proto-ipv6-fragmentation",
-	#
-	# Assume a MTU size of 9000
-	#"fragmentation-buffer-size-8192",
-	#"reassembly-buffer-size-8192",
+	"proto-ipv6-fragmentation",## Assume a MTU size of 9000#"fragmentation-buffer-size-8192",#"reassembly-buffer-size-8192",
 ]
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
@@ -169,8 +181,8 @@ raw-cpuid = "11"
 uart_16550 = "0.4"
 x86_64 = "0.15"
 memory_addresses = { version = "0.3", default-features = false, features = [
-	"x86_64",
-	"conv-x86_64",
+		"x86_64",
+		"conv-x86_64",
 ] }
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
@@ -179,7 +191,7 @@ arm-gic = { version = "0.6" }
 arm-pl011-uart = { version = "0.4", default-features = false }
 semihosting = { version = "0.1", optional = true }
 memory_addresses = { version = "0.3", default-features = false, features = [
-	"aarch64",
+		"aarch64",
 ] }
 
 [target.'cfg(target_arch = "riscv64")'.dependencies]
@@ -189,7 +201,7 @@ semihosting = { version = "0.1", optional = true }
 tock-registers = { version = "0.10", optional = true }
 trapframe = "0.10"
 memory_addresses = { version = "0.3", default-features = false, features = [
-	"riscv64",
+		"riscv64",
 ] }
 
 [dev-dependencies]
@@ -202,13 +214,8 @@ built = { version = "0.8", features = ["git2", "chrono"] }
 llvm-tools = "0.1"
 
 [workspace]
-members = [
-	"hermit-macro",
-	"xtask",
-]
-exclude = [
-	"hermit-builtins",
-]
+members = ["hermit-macro", "xtask"]
+exclude = ["hermit-builtins"]
 
 [patch.crates-io]
 safe-mmio = { git = "https://github.com/hermit-os/safe-mmio", branch = "be" }

hermit-macro/Cargo.toml

@@ -1,7 +1,9 @@
 [package]
 name = "hermit-macro"
 version = "0.1.0"
-authors = ["Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>"]
+authors = [
+	"Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>",
+]
 edition = "2024"
 description = "Proc macro implementation to defined system calls"
 repository = "https://github.com/hermit-os/kernel"

xtask/Cargo.toml

@@ -5,7 +5,12 @@ edition = "2024"
 
 [features]
 default = ["ci"]
-ci = ["dep:ovmf-prebuilt", "dep:sysinfo", "dep:ureq", "dep:wait-timeout"]
+ci = [
+	"dep:ovmf-prebuilt",
+	"dep:sysinfo",
+	"dep:ureq",
+	"dep:wait-timeout",
+]
 
 [dependencies]
 anyhow = "1.0"