Skip to content

Commit 8b188a1

Browse files
authored
Merge branch 'main' into semver
2 parents aaca684 + 12f85ba commit 8b188a1

File tree

54 files changed

+228
-235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+228
-235
lines changed

Cargo.lock

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

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# allowlisted using a toolchain that requires it, causing the A/B-test to
1212
# always fail.
1313
[toolchain]
14-
channel = "1.85.0"
14+
channel = "1.87.0"
1515
targets = ["x86_64-unknown-linux-musl", "aarch64-unknown-linux-musl"]
1616
profile = "minimal"
1717

src/acpi-tables/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bench = false
1515
[dependencies]
1616
displaydoc = "0.2.5"
1717
thiserror = "2.0.12"
18-
vm-memory = { version = "0.16.1", features = ["backend-mmap", "backend-bitmap"] }
18+
vm-memory = { version = "0.16.2", features = ["backend-mmap", "backend-bitmap"] }
1919
zerocopy = { version = "0.8.25", features = ["derive"] }
2020

2121
[lints]

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.38", features = ["derive"] }
13+
clap = { version = "4.5.39", features = ["derive"] }
1414
itertools = "0.14.0"
1515
proc-macro2 = { version = "1.0.95", features = ["span-locations"] }
1616
quote = "1.0.40"

src/cpu-template-helper/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ bench = false
1313
tracing = ["log-instrument", "vmm/tracing"]
1414

1515
[dependencies]
16-
clap = { version = "4.5.38", features = ["derive", "string"] }
16+
clap = { version = "4.5.39", features = ["derive", "string"] }
1717
displaydoc = "0.2.5"
1818
libc = "0.2.172"
1919
log-instrument = { path = "../log-instrument", optional = true }
@@ -22,7 +22,7 @@ serde_json = "1.0.140"
2222
thiserror = "2.0.12"
2323

2424
vmm = { path = "../vmm" }
25-
vmm-sys-util = "0.12.1"
25+
vmm-sys-util = "0.14.0"
2626

2727
[lints]
2828
workspace = true

src/firecracker/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ gdb = ["vmm/gdb"]
2121

2222
[dependencies]
2323
displaydoc = "0.2.5"
24-
event-manager = "0.4.0"
24+
event-manager = "0.4.1"
2525
libc = "0.2.172"
2626
log-instrument = { path = "../log-instrument", optional = true }
2727
micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }
@@ -32,7 +32,7 @@ thiserror = "2.0.12"
3232
timerfd = "1.6.0"
3333
utils = { path = "../utils" }
3434
vmm = { path = "../vmm" }
35-
vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
35+
vmm-sys-util = { version = "0.14.0", features = ["with-serde"] }
3636

3737
[build-dependencies]
3838
seccompiler = { path = "../seccompiler" }

src/jailer/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ libc = "0.2.172"
1919
log-instrument = { path = "../log-instrument", optional = true }
2020
regex = { version = "1.11.1", default-features = false, features = ["std"] }
2121
thiserror = "2.0.12"
22-
vmm-sys-util = "0.12.1"
22+
vmm-sys-util = "0.14.0"
2323

2424
utils = { path = "../utils" }
2525

src/rebase-snap/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ displaydoc = "0.2.5"
1717
libc = "0.2.172"
1818
log-instrument = { path = "../log-instrument", optional = true }
1919
thiserror = "2.0.12"
20-
vmm-sys-util = "0.12.1"
20+
vmm-sys-util = "0.14.0"
2121

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

src/rebase-snap/src/main.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ enum RebaseSnapError {
4444
}
4545

4646
fn build_arg_parser<'a>() -> ArgParser<'a> {
47-
let arg_parser = ArgParser::new()
47+
ArgParser::new()
4848
.arg(
4949
Argument::new(BASE_FILE)
5050
.required(true)
@@ -56,9 +56,7 @@ fn build_arg_parser<'a>() -> ArgParser<'a> {
5656
.required(true)
5757
.takes_value(true)
5858
.help("File path of the diff mem snapshot."),
59-
);
60-
61-
arg_parser
59+
)
6260
}
6361

6462
fn get_files(args: &Arguments) -> Result<(File, File), FileError> {

src/seccompiler/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ bench = false
1717

1818
[dependencies]
1919
bincode = { version = "2.0.1", features = ["serde"] }
20-
clap = { version = "4.5.38", features = ["derive", "string"] }
20+
clap = { version = "4.5.39", features = ["derive", "string"] }
2121
displaydoc = "0.2.5"
2222
libc = "0.2.172"
2323
serde = { version = "1.0.219", features = ["derive"] }

0 commit comments

Comments
 (0)