Skip to content

Commit b4af84d

Browse files
authored
Merge branch 'main' into devctr-2404
2 parents 2ac41fa + 7803c42 commit b4af84d

File tree

19 files changed

+193
-121
lines changed

19 files changed

+193
-121
lines changed

Cargo.lock

Lines changed: 17 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/acpi-tables/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license = "Apache-2.0"
88

99
[dependencies]
1010
displaydoc = "0.2.5"
11-
thiserror = "1.0.63"
11+
thiserror = "1.0.64"
1212
vm-memory = { version = "0.15.0", features = ["backend-mmap", "backend-bitmap"] }
1313
zerocopy = { version = "0.7.35", features = ["derive"] }
1414

src/clippy-tracing/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ name = "clippy-tracing"
1010
bench = false
1111

1212
[dependencies]
13-
clap = { version = "4.5.17", features = ["derive"] }
13+
clap = { version = "4.5.18", features = ["derive"] }
1414
itertools = "0.13.0"
1515
proc-macro2 = { version = "1.0.86", features = ["span-locations"] }
1616
quote = "1.0.37"

src/cpu-template-helper/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ name = "cpu-template-helper"
1010
bench = false
1111

1212
[dependencies]
13-
clap = { version = "4.5.17", features = ["derive", "string"] }
13+
clap = { version = "4.5.18", features = ["derive", "string"] }
1414
displaydoc = "0.2.5"
1515
libc = "0.2.158"
1616
log-instrument = { path = "../log-instrument", optional = true }
1717
serde = { version = "1.0.210", features = ["derive"] }
1818
serde_json = "1.0.128"
19-
thiserror = "1.0.63"
19+
thiserror = "1.0.64"
2020

2121
vmm = { path = "../vmm" }
2222
vmm-sys-util = "0.12.1"

src/firecracker/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ seccompiler = { path = "../seccompiler" }
2626
serde = { version = "1.0.210", features = ["derive"] }
2727
serde_derive = "1.0.136"
2828
serde_json = "1.0.128"
29-
thiserror = "1.0.63"
29+
thiserror = "1.0.64"
3030
timerfd = "1.6.0"
3131
utils = { path = "../utils" }
3232
vmm = { path = "../vmm" }

src/jailer/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ libc = "0.2.158"
1616
log-instrument = { path = "../log-instrument", optional = true }
1717
nix = { version = "0.29.0", default-features = false, features = ["dir"] }
1818
regex = { version = "1.10.6", default-features = false, features = ["std"] }
19-
thiserror = "1.0.63"
19+
thiserror = "1.0.64"
2020
vmm-sys-util = "0.12.1"
2121

2222
utils = { path = "../utils" }

src/rebase-snap/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ bench = false
1313
displaydoc = "0.2.5"
1414
libc = "0.2.158"
1515
log-instrument = { path = "../log-instrument", optional = true }
16-
thiserror = "1.0.63"
16+
thiserror = "1.0.64"
1717
vmm-sys-util = "0.12.1"
1818

1919
utils = { path = "../utils" }

src/seccompiler/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ libc = "0.2.158"
2222
log-instrument = { path = "../log-instrument", optional = true }
2323
serde = { version = "1.0.210", features = ["derive"] }
2424
serde_json = "1.0.128"
25-
thiserror = "1.0.63"
25+
thiserror = "1.0.64"
2626

2727
utils = { path = "../utils" }
2828

src/snapshot-editor/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ name = "snapshot-editor"
1010
bench = false
1111

1212
[dependencies]
13-
clap = { version = "4.5.17", features = ["derive", "string"] }
13+
clap = { version = "4.5.18", features = ["derive", "string"] }
1414
displaydoc = "0.2.5"
1515

1616
fc_utils = { package = "utils", path = "../utils" }
1717
libc = "0.2.158"
1818
log-instrument = { path = "../log-instrument", optional = true }
1919
semver = "1.0.23"
20-
thiserror = "1.0.63"
20+
thiserror = "1.0.64"
2121
vmm = { path = "../vmm" }
2222
vmm-sys-util = "0.12.1"
2323

src/utils/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ displaydoc = "0.2.5"
1414
libc = "0.2.158"
1515
log-instrument = { path = "../log-instrument", optional = true }
1616
serde = { version = "1.0.210", features = ["derive"] }
17-
thiserror = "1.0.63"
17+
thiserror = "1.0.64"
1818
vm-memory = { version = "0.15.0", features = ["backend-mmap", "backend-bitmap"] }
1919
vmm-sys-util = "0.12.1"
2020

0 commit comments

Comments
 (0)