Skip to content

Commit

Permalink
build: Fix Cargo.toml formatting
Browse files Browse the repository at this point in the history
In 42e9632 a fix was made to address a
typo in the taplo configuration file. Fixing this typo indicated that
many Cargo.toml files were no longer adhering to the formatting rules.
Fix the formatting by running `taplo fmt`.

Signed-off-by: Rob Bradford <[email protected]>
  • Loading branch information
rbradford authored and likebreath committed Jun 18, 2024
1 parent 243dc59 commit 08cf983
Show file tree
Hide file tree
Showing 18 changed files with 41 additions and 41 deletions.
12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@ wait-timeout = "0.2.0"
# Please adjust `vmm::feature_list()` accordingly when changing the
# feature list below
[features]
dbus_api = ["zbus", "vmm/dbus_api"]
default = ["kvm", "io_uring"]
dbus_api = ["vmm/dbus_api", "zbus"]
default = ["io_uring", "kvm"]
dhat-heap = ["dhat", "vmm/dhat-heap"] # For heap profiling
guest_debug = ["vmm/guest_debug"]
igvm = ["vmm/igvm", "mshv"]
igvm = ["mshv", "vmm/igvm"]
io_uring = ["vmm/io_uring"]
kvm = ["vmm/kvm"]
mshv = ["vmm/mshv"]
sev_snp = ["igvm", "vmm/sev_snp", "mshv"]
sev_snp = ["igvm", "mshv", "vmm/sev_snp"]
tdx = ["vmm/tdx"]
tracing = ["vmm/tracing", "tracer/tracing"]
tracing = ["tracer/tracing", "vmm/tracing"]

[workspace]
members = [
Expand All @@ -93,9 +93,9 @@ members = [
"vhost_user_block",
"vhost_user_net",
"virtio-devices",
"vmm",
"vm-allocator",
"vm-device",
"vm-migration",
"vm-virtio",
"vmm",
]
6 changes: 3 additions & 3 deletions arch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ anyhow = "1.0.81"
byteorder = "1.5.0"
hypervisor = { path = "../hypervisor" }
libc = "0.2.153"
linux-loader = { version = "0.11.0", features = ["elf", "bzimage", "pe"] }
linux-loader = { version = "0.11.0", features = ["bzimage", "elf", "pe"] }
log = "0.4.21"
serde = { version = "1.0.197", features = ["rc", "derive"] }
serde = { version = "1.0.197", features = ["derive", "rc"] }
thiserror = "1.0.60"
uuid = "1.8.0"
vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-bitmap",
"backend-mmap",
] }
vm-migration = { path = "../vm-migration" }
vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
Expand Down
4 changes: 2 additions & 2 deletions block/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
authors = ["The Cloud Hypervisor Authors", "The Chromium OS Authors"]
authors = ["The Chromium OS Authors", "The Cloud Hypervisor Authors"]
edition = "2021"
name = "block"
version = "0.1.0"
Expand All @@ -22,9 +22,9 @@ uuid = { version = "1.8.0", features = ["v4"] }
virtio-bindings = { version = "0.2.2", features = ["virtio-v5_0_0"] }
virtio-queue = "0.12.0"
vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-atomic",
"backend-bitmap",
"backend-mmap",
] }
vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = "0.12.1"
2 changes: 1 addition & 1 deletion event_monitor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ version = "0.1.0"
flume = "0.11.0"
libc = "0.2.153"
once_cell = "1.19.0"
serde = { version = "1.0.197", features = ["rc", "derive"] }
serde = { version = "1.0.197", features = ["derive", "rc"] }
serde_json = "1.0.115"
2 changes: 1 addition & 1 deletion fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ devices = { path = "../devices" }
epoll = "4.3.3"
libc = "0.2.155"
libfuzzer-sys = "0.4.7"
linux-loader = { version = "0.11.0", features = ["elf", "bzimage", "pe"] }
linux-loader = { version = "0.11.0", features = ["bzimage", "elf", "pe"] }
micro_http = { git = "https://github.com/firecracker-microvm/micro-http", branch = "main" }
net_util = { path = "../net_util" }
once_cell = "1.19.0"
Expand Down
12 changes: 6 additions & 6 deletions hypervisor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ name = "hypervisor"
version = "0.1.0"

[features]
kvm = ["kvm-ioctls", "kvm-bindings", "vfio-ioctls/kvm"]
mshv = ["mshv-ioctls", "mshv-bindings", "vfio-ioctls/mshv", "iced-x86"]
kvm = ["kvm-bindings", "kvm-ioctls", "vfio-ioctls/kvm"]
mshv = ["iced-x86", "mshv-bindings", "mshv-ioctls", "vfio-ioctls/mshv"]
sev_snp = ["igvm", "igvm_defs"]
tdx = []

Expand All @@ -21,25 +21,25 @@ kvm-ioctls = { version = "0.17.0", optional = true }
libc = "0.2.153"
log = "0.4.21"
mshv-bindings = { git = "https://github.com/rust-vmm/mshv", tag = "v0.2.0", features = [
"with-serde",
"fam-wrappers",
"with-serde",
], optional = true }
mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", tag = "v0.2.0", optional = true }
serde = { version = "1.0.197", features = ["rc", "derive"] }
serde = { version = "1.0.197", features = ["derive", "rc"] }
serde_with = { version = "3.7.0", default-features = false, features = [
"macros",
] }
thiserror = "1.0.60"
vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false }
vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-atomic",
"backend-mmap",
] }
vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }

[target.'cfg(target_arch = "x86_64")'.dependencies.iced-x86]
default-features = false
features = ["std", "decoder", "op_code_info", "instr_info", "fast_fmt"]
features = ["decoder", "fast_fmt", "instr_info", "op_code_info", "std"]
optional = true
version = "1.21.0"

Expand Down
2 changes: 1 addition & 1 deletion net_util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ thiserror = "1.0.60"
virtio-bindings = "0.2.2"
virtio-queue = "0.12.0"
vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-atomic",
"backend-bitmap",
"backend-mmap",
] }
vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = "0.12.1"
Expand Down
2 changes: 1 addition & 1 deletion pci/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ vfio_user = { git = "https://github.com/rust-vmm/vfio-user", branch = "main" }
vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" }
vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-atomic",
"backend-bitmap",
"backend-mmap",
] }
vm-migration = { path = "../vm-migration" }
vmm-sys-util = "0.12.1"
2 changes: 1 addition & 1 deletion performance-metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "0.1.0"
[dependencies]
clap = { version = "4.5.4", features = ["wrap_help"] }
dirs = "5.0.1"
serde = { version = "1.0.197", features = ["rc", "derive"] }
serde = { version = "1.0.197", features = ["derive", "rc"] }
serde_json = "1.0.115"
test_infra = { path = "../test_infra" }
thiserror = "1.0.60"
Expand Down
2 changes: 1 addition & 1 deletion test_infra/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dirs = "5.0.1"
epoll = "4.3.3"
libc = "0.2.153"
once_cell = "1.19.0"
serde = { version = "1.0.197", features = ["rc", "derive"] }
serde = { version = "1.0.197", features = ["derive", "rc"] }
serde_json = "1.0.115"
ssh2 = { version = "0.9.4", features = ["vendored-openssl"] }
vmm-sys-util = "0.12.1"
Expand Down
2 changes: 1 addition & 1 deletion tracer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ version = "0.1.0"
libc = "0.2.153"
log = "0.4.21"
once_cell = "1.19.0"
serde = { version = "1.0.197", features = ["rc", "derive"] }
serde = { version = "1.0.197", features = ["derive", "rc"] }
serde_json = "1.0.115"

[features]
Expand Down
2 changes: 1 addition & 1 deletion vhost_user_block/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version = "0.1.0"

[dependencies]
block = { path = "../block" }
clap = { version = "4.5.4", features = ["wrap_help", "cargo"] }
clap = { version = "4.5.4", features = ["cargo", "wrap_help"] }
env_logger = "0.11.3"
epoll = "4.3.3"
libc = "0.2.153"
Expand Down
2 changes: 1 addition & 1 deletion vhost_user_net/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name = "vhost_user_net"
version = "0.1.0"

[dependencies]
clap = { version = "4.5.4", features = ["wrap_help", "cargo"] }
clap = { version = "4.5.4", features = ["cargo", "wrap_help"] }
env_logger = "0.11.3"
epoll = "4.3.3"
libc = "0.2.153"
Expand Down
6 changes: 3 additions & 3 deletions virtio-devices/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ serde_with = { version = "3.7.0", default-features = false, features = [
serial_buffer = { path = "../serial_buffer" }
thiserror = "1.0.60"
vhost = { version = "0.11.0", features = [
"vhost-user-frontend",
"vhost-user-backend",
"vhost-kern",
"vhost-user-backend",
"vhost-user-frontend",
"vhost-vdpa",
] }
virtio-bindings = { version = "0.2.2", features = ["virtio-v5_0_0"] }
virtio-queue = "0.12.0"
vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" }
vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-atomic",
"backend-bitmap",
"backend-mmap",
] }
vm-migration = { path = "../vm-migration" }
vm-virtio = { path = "../vm-virtio" }
Expand Down
2 changes: 1 addition & 1 deletion vm-device/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mshv = ["vfio-ioctls/mshv"]
[dependencies]
anyhow = "1.0.81"
hypervisor = { path = "../hypervisor" }
serde = { version = "1.0.197", features = ["rc", "derive"] }
serde = { version = "1.0.197", features = ["derive", "rc"] }
thiserror = "1.0.60"
vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false }
vm-memory = { version = "0.14.1", features = ["backend-mmap"] }
Expand Down
4 changes: 2 additions & 2 deletions vm-migration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ version = "0.1.0"

[dependencies]
anyhow = "1.0.81"
serde = { version = "1.0.197", features = ["rc", "derive"] }
serde = { version = "1.0.197", features = ["derive", "rc"] }
serde_json = "1.0.115"
thiserror = "1.0.60"
vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-atomic",
"backend-mmap",
] }
2 changes: 1 addition & 1 deletion vm-virtio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ default = []
log = "0.4.21"
virtio-queue = "0.12.0"
vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-atomic",
"backend-bitmap",
"backend-mmap",
] }
16 changes: 8 additions & 8 deletions vmm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ version = "0.1.0"
dbus_api = ["blocking", "futures", "zbus"]
default = []
dhat-heap = ["dhat"] # For heap profiling
guest_debug = ["kvm", "gdbstub", "gdbstub_arch"]
igvm = ["hex", "dep:igvm", "igvm_defs", "mshv-bindings", "range_map_vec"]
guest_debug = ["gdbstub", "gdbstub_arch", "kvm"]
igvm = ["dep:igvm", "hex", "igvm_defs", "mshv-bindings", "range_map_vec"]
io_uring = ["block/io_uring"]
kvm = ["hypervisor/kvm", "vfio-ioctls/kvm", "vm-device/kvm", "pci/kvm"]
mshv = ["hypervisor/mshv", "vfio-ioctls/mshv", "vm-device/mshv", "pci/mshv"]
kvm = ["hypervisor/kvm", "pci/kvm", "vfio-ioctls/kvm", "vm-device/kvm"]
mshv = ["hypervisor/mshv", "pci/mshv", "vfio-ioctls/mshv", "vm-device/mshv"]
sev_snp = ["arch/sev_snp", "hypervisor/sev_snp", "virtio-devices/sev_snp"]
tdx = ["arch/tdx", "hypervisor/tdx"]
tracing = ["tracer/tracing"]
Expand Down Expand Up @@ -40,12 +40,12 @@ hypervisor = { path = "../hypervisor" }
igvm = { version = "0.3.1", optional = true }
igvm_defs = { version = "0.3.1", optional = true }
libc = "0.2.153"
linux-loader = { version = "0.11.0", features = ["elf", "bzimage", "pe"] }
linux-loader = { version = "0.11.0", features = ["bzimage", "elf", "pe"] }
log = "0.4.21"
micro_http = { git = "https://github.com/firecracker-microvm/micro-http", branch = "main" }
mshv-bindings = { git = "https://github.com/rust-vmm/mshv", tag = "v0.2.0", features = [
"with-serde",
"fam-wrappers",
"with-serde",
], optional = true }
net_util = { path = "../net_util" }
once_cell = "1.19.0"
Expand All @@ -54,7 +54,7 @@ pci = { path = "../pci" }
range_map_vec = { version = "0.2.0", optional = true }
rate_limiter = { path = "../rate_limiter" }
seccompiler = "0.4.0"
serde = { version = "1.0.197", features = ["rc", "derive"] }
serde = { version = "1.0.197", features = ["derive", "rc"] }
serde_json = "1.0.115"
serial_buffer = { path = "../serial_buffer" }
signal-hook = "0.3.17"
Expand All @@ -68,9 +68,9 @@ virtio-queue = "0.12.0"
vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" }
vm-memory = { version = "0.14.1", features = [
"backend-mmap",
"backend-atomic",
"backend-bitmap",
"backend-mmap",
] }
vm-migration = { path = "../vm-migration" }
vm-virtio = { path = "../vm-virtio" }
Expand Down

0 comments on commit 08cf983

Please sign in to comment.