Skip to content

Commit 85e7f35

Browse files
committed
fix: run cargo-sort
Previously, our `cargo-sort` style test did not pick up `utils` and `vmm`, because they were not formally part of the cargo workspace. After adding them, the test started failing because the dependencies were unsorted, so manually run `cargo-sort` once. Signed-off-by: Patrick Roy <[email protected]>
1 parent c641d24 commit 85e7f35

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

src/cpu-template-helper/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ log-instrument = { path = "../log-instrument", optional = true }
1717
serde = { version = "1.0.196", features = ["derive"] }
1818
serde_json = "1.0.115"
1919
thiserror = "1.0.58"
20-
vmm-sys-util = "0.12.1"
2120

2221
vmm = { path = "../vmm" }
22+
vmm-sys-util = "0.12.1"
2323

2424
[features]
2525
tracing = ["log-instrument", "vmm/tracing"]

src/firecracker/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ event-manager = "0.4.0"
2121
libc = "0.2.153"
2222
log-instrument = { path = "../log-instrument", optional = true }
2323
micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
24+
25+
seccompiler = { path = "../seccompiler" }
2426
serde = { version = "1.0.196", features = ["derive"] }
2527
serde_derive = "1.0.136"
2628
serde_json = "1.0.115"
2729
thiserror = "1.0.58"
2830
timerfd = "1.6.0"
29-
30-
seccompiler = { path = "../seccompiler" }
3131
utils = { path = "../utils" }
3232
vmm = { path = "../vmm" }
3333

src/snapshot-editor/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ bench = false
1212
[dependencies]
1313
clap = { version = "4.5.4", features = ["derive", "string"] }
1414
displaydoc = "0.2.4"
15+
16+
fc_utils = { package = "utils", path = "../utils" }
1517
libc = "0.2.153"
1618
log-instrument = { path = "../log-instrument", optional = true }
1719
semver = "1.0.22"
1820
thiserror = "1.0.58"
1921
vmm = { path = "../vmm" }
2022

21-
fc_utils = { package = "utils", path = "../utils" }
22-
2323
[target.'cfg(target_arch = "aarch64")'.dependencies]
2424
clap-num = "1.0.2"
2525

src/utils/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ bench = false
1010

1111
[dependencies]
1212
derive_more = { version = "0.99.17", default-features = false, features = ["from"] }
13+
displaydoc = "0.2.4"
1314
libc = "0.2.147"
15+
log-instrument = { path = "../log-instrument", optional = true }
1416
serde = { version = "1.0.165", features = ["derive"] }
1517
thiserror = "1.0.32"
16-
displaydoc = "0.2.4"
17-
vmm-sys-util = "0.12.1"
1818
vm-memory = { version = "0.14.1", features = ["backend-mmap", "backend-bitmap"] }
19-
log-instrument = { path = "../log-instrument", optional = true }
19+
vmm-sys-util = "0.12.1"
2020

2121
[dev-dependencies]
2222
serde_json = "1.0.99"

src/vmm/Cargo.toml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,50 +9,50 @@ license = "Apache-2.0"
99
bench = false
1010

1111
[dependencies]
12+
acpi_tables = { path = "../acpi-tables" }
13+
aes-gcm = { version = "0.10.1", default-features = false, features = ["aes"] }
1214
aws-lc-rs = { version = "1.6.1", features = ["bindgen"] }
15+
base64 = "0.21.0"
16+
bincode = "1.2.1"
1317
bitflags = "2.0.2"
18+
crc64 = "2.0.0"
1419
derive_more = { version = "0.99.17", default-features = false, features = ["from", "display"] }
20+
displaydoc = "0.2.4"
1521
event-manager = "0.4.0"
1622
kvm-bindings = { version = "0.7.0", features = ["fam-wrappers"] }
1723
kvm-ioctls = "0.16.0"
1824
lazy_static = "1.4.0"
1925
libc = "0.2.117"
20-
memfd = "0.6.3"
2126
linux-loader = "0.11.0"
22-
serde = { version = "1.0.136", features = ["derive", "rc"] }
27+
log = { version = "0.4.17", features = ["std", "serde"] }
28+
log-instrument = { path = "../log-instrument", optional = true }
29+
memfd = "0.6.3"
30+
micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
31+
32+
seccompiler = { path = "../seccompiler" }
2333
semver = { version = "1.0.17", features = ["serde"] }
34+
serde = { version = "1.0.136", features = ["derive", "rc"] }
2435
serde_json = "1.0.78"
25-
timerfd = "1.5.0"
36+
slab = "0.4.7"
37+
smallvec = "1.11.2"
2638
thiserror = "1.0.32"
27-
displaydoc = "0.2.4"
39+
timerfd = "1.5.0"
2840
userfaultfd = "0.7.0"
41+
utils = { path = "../utils" }
2942
vhost = { version = "0.10.0", features = ["vhost-user-frontend"] }
3043
vm-allocator = "0.1.0"
31-
vm-superio = "0.7.0"
3244
vm-memory = { version = "0.14.1", features = ["backend-mmap", "backend-bitmap"] }
33-
log = { version = "0.4.17", features = ["std", "serde"] }
34-
aes-gcm = { version = "0.10.1", default-features = false, features = ["aes"] }
35-
base64 = "0.21.0"
36-
bincode = "1.2.1"
37-
micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
38-
log-instrument = { path = "../log-instrument", optional = true }
39-
crc64 = "2.0.0"
40-
slab = "0.4.7"
45+
vm-superio = "0.7.0"
4146
zerocopy = { version = "0.7.32" }
4247

43-
seccompiler = { path = "../seccompiler" }
44-
utils = { path = "../utils" }
45-
smallvec = "1.11.2"
46-
acpi_tables = { path = "../acpi-tables" }
47-
4848
[target.'cfg(target_arch = "aarch64")'.dependencies]
4949
vm-fdt = "0.2.0"
5050

5151
[dev-dependencies]
5252
criterion = { version = "0.5.0", default-features = false }
5353
device_tree = "1.1.0"
54-
proptest = { version = "1.0.0", default-features = false, features = ["std"] }
5554
itertools = "0.12.0"
55+
proptest = { version = "1.0.0", default-features = false, features = ["std"] }
5656

5757
[features]
5858
tracing = ["log-instrument"]

0 commit comments

Comments
 (0)