chore: run cargo-sort

we picked up a new version of it through the devctr upgrade, and
apparently it has _opinions_.

Signed-off-by: Patrick Roy <[email protected]>

Author: roypat

Cargo.toml

@@ -4,7 +4,15 @@ members = ["src/*"]
 # for the gnu target, and the jailer needs a statically compiled binary to work correctly.
 # See https://github.com/firecracker-microvm/firecracker/commit/3bf285c8f8a815149923c562dd7edaffcaf10c4e
 # and https://github.com/firecracker-microvm/firecracker/issues/2102
-default-members = ["src/clippy-tracing", "src/cpu-template-helper", "src/firecracker", "src/rebase-snap", "src/seccompiler", "src/snapshot-editor", "src/acpi-tables"]
+default-members = [
+    "src/clippy-tracing",
+    "src/cpu-template-helper",
+    "src/firecracker",
+    "src/rebase-snap",
+    "src/seccompiler",
+    "src/snapshot-editor",
+    "src/acpi-tables",
+]
 resolver = "2"
 
 [workspace.lints.rust]

src/acpi-tables/Cargo.toml

@@ -1,9 +1,15 @@
 [package]
 name = "acpi_tables"
 version = "0.1.0"
-authors = ["The Cloud Hypervisor Authors", "Amazon Firecracker team <[email protected]>"]
+authors = [
+    "The Cloud Hypervisor Authors",
+    "Amazon Firecracker team <[email protected]>",
+]
 edition = "2024"
 license = "Apache-2.0"
+
+[lib]
+bench = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
@@ -12,8 +18,5 @@ thiserror = "2.0.12"
 vm-memory = { version = "0.16.1", features = ["backend-mmap", "backend-bitmap"] }
 zerocopy = { version = "0.8.25", features = ["derive"] }
 
-[lib]
-bench = false
-
 [lints]
 workspace = true

src/cpu-template-helper/Cargo.toml

@@ -9,6 +9,9 @@ license = "Apache-2.0"
 name = "cpu-template-helper"
 bench = false
 
+[features]
+tracing = ["log-instrument", "vmm/tracing"]
+
 [dependencies]
 clap = { version = "4.5.38", features = ["derive", "string"] }
 displaydoc = "0.2.5"
@@ -21,8 +24,5 @@ thiserror = "2.0.12"
 vmm = { path = "../vmm" }
 vmm-sys-util = "0.12.1"
 
-[features]
-tracing = ["log-instrument", "vmm/tracing"]
-
 [lints]
 workspace = true

src/firecracker/Cargo.toml

@@ -8,20 +8,23 @@ description = "Firecracker enables you to deploy workloads in lightweight virtua
 homepage = "https://firecracker-microvm.github.io/"
 license = "Apache-2.0"
 
+[lib]
+bench = false
+
 [[bin]]
 name = "firecracker"
 bench = false
 
-[lib]
-bench = false
+[features]
+tracing = ["log-instrument", "utils/tracing", "vmm/tracing"]
+gdb = ["vmm/gdb"]
 
 [dependencies]
 displaydoc = "0.2.5"
 event-manager = "0.4.0"
 libc = "0.2.172"
 log-instrument = { path = "../log-instrument", optional = true }
 micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
-
 serde = { version = "1.0.219", features = ["derive"] }
 serde_derive = "1.0.136"
 serde_json = "1.0.140"
@@ -31,6 +34,11 @@ utils = { path = "../utils" }
 vmm = { path = "../vmm" }
 vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
 
+[build-dependencies]
+seccompiler = { path = "../seccompiler" }
+serde = { version = "1.0.219" }
+serde_json = "1.0.140"
+
 [dev-dependencies]
 cargo_toml = "0.22.1"
 libc = "0.2.172"
@@ -40,15 +48,6 @@ regex = { version = "1.11.1", default-features = false, features = ["std", "unic
 serde = { version = "1.0.219", features = ["derive"] }
 userfaultfd = "0.8.1"
 
-[build-dependencies]
-seccompiler = { path = "../seccompiler" }
-serde = { version = "1.0.219" }
-serde_json = "1.0.140"
-
-[features]
-tracing = ["log-instrument", "utils/tracing", "vmm/tracing"]
-gdb = ["vmm/gdb"]
-
 [lints]
 workspace = true
 

src/jailer/Cargo.toml

@@ -11,6 +11,9 @@ license = "Apache-2.0"
 name = "jailer"
 bench = false
 
+[features]
+tracing = ["log-instrument", "utils/tracing"]
+
 [dependencies]
 libc = "0.2.172"
 log-instrument = { path = "../log-instrument", optional = true }
@@ -20,8 +23,5 @@ vmm-sys-util = "0.12.1"
 
 utils = { path = "../utils" }
 
-[features]
-tracing = ["log-instrument", "utils/tracing"]
-
 [lints]
 workspace = true

src/log-instrument/Cargo.toml

@@ -9,6 +9,13 @@ license = "Apache-2.0"
 [lib]
 bench = false
 
+[dependencies]
+log = "0.4.27"
+log-instrument-macros = { path = "../log-instrument-macros" }
+
+[dev-dependencies]
+env_logger = "0.11.8"
+
 [[example]]
 name = "one"
 
@@ -27,12 +34,5 @@ name = "five"
 [[example]]
 name = "six"
 
-[dependencies]
-log = "0.4.27"
-log-instrument-macros = { path = "../log-instrument-macros" }
-
-[dev-dependencies]
-env_logger = "0.11.8"
-
 [lints]
 workspace = true

src/rebase-snap/Cargo.toml

@@ -9,6 +9,9 @@ license = "Apache-2.0"
 name = "rebase-snap"
 bench = false
 
+[features]
+tracing = ["log-instrument", "utils/tracing"]
+
 [dependencies]
 displaydoc = "0.2.5"
 libc = "0.2.172"
@@ -18,8 +21,5 @@ vmm-sys-util = "0.12.1"
 
 utils = { path = "../utils" }
 
-[features]
-tracing = ["log-instrument", "utils/tracing"]
-
 [lints]
 workspace = true

src/snapshot-editor/Cargo.toml

@@ -9,6 +9,9 @@ license = "Apache-2.0"
 name = "snapshot-editor"
 bench = false
 
+[features]
+tracing = ["log-instrument", "fc_utils/tracing", "vmm/tracing"]
+
 [dependencies]
 clap = { version = "4.5.38", features = ["derive", "string"] }
 displaydoc = "0.2.5"
@@ -24,8 +27,5 @@ vmm-sys-util = "0.12.1"
 [target.'cfg(target_arch = "aarch64")'.dependencies]
 clap-num = "1.2.0"
 
-[features]
-tracing = ["log-instrument", "fc_utils/tracing", "vmm/tracing"]
-
 [lints]
 workspace = true

src/utils/Cargo.toml

@@ -8,14 +8,14 @@ license = "Apache-2.0"
 [lib]
 bench = false
 
+[features]
+tracing = ["log-instrument"]
+
 [dependencies]
 displaydoc = "0.2.5"
 libc = "0.2.172"
 log-instrument = { path = "../log-instrument", optional = true }
 thiserror = "2.0.12"
 
-[features]
-tracing = ["log-instrument"]
-
 [lints]
 workspace = true

src/vmm/Cargo.toml

@@ -8,9 +8,14 @@ license = "Apache-2.0"
 [lib]
 bench = false
 
+[features]
+default = []
+tracing = ["log-instrument"]
+gdb = ["arrayvec", "gdbstub", "gdbstub_arch"]
+
 [dependencies]
 acpi_tables = { path = "../acpi-tables" }
-aes-gcm =  { version = "0.10.1", default-features = false, features = ["aes"] }
+aes-gcm = { version = "0.10.1", default-features = false, features = ["aes"] }
 arrayvec = { version = "0.7.6", optional = true }
 aws-lc-rs = { version = "1.13.1", features = ["bindgen"] }
 base64 = "0.22.1"
@@ -54,11 +59,6 @@ device_tree = "1.1.0"
 itertools = "0.14.0"
 proptest = { version = "1.6.0", default-features = false, features = ["std"] }
 
-[features]
-default = []
-tracing = ["log-instrument"]
-gdb = ["arrayvec", "gdbstub", "gdbstub_arch"]
-
 [[bench]]
 name = "cpu_templates"
 harness = false