Skip to content

Commit

Permalink
Merge branch 'main' into nightly-only-boottime
Browse files Browse the repository at this point in the history
  • Loading branch information
roypat authored Oct 1, 2024
2 parents cc50bbc + b224adb commit b5878a3
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 38 deletions.
57 changes: 33 additions & 24 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/clippy-tracing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ clap = { version = "4.5.18", features = ["derive"] }
itertools = "0.13.0"
proc-macro2 = { version = "1.0.86", features = ["span-locations"] }
quote = "1.0.37"
syn = { version = "2.0.77", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] }
syn = { version = "2.0.79", features = ["full", "extra-traits", "visit", "visit-mut", "printing"] }
walkdir = "2.5.0"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion src/cpu-template-helper/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bench = false
[dependencies]
clap = { version = "4.5.18", features = ["derive", "string"] }
displaydoc = "0.2.5"
libc = "0.2.158"
libc = "0.2.159"
log-instrument = { path = "../log-instrument", optional = true }
serde = { version = "1.0.210", features = ["derive"] }
serde_json = "1.0.128"
Expand Down
8 changes: 4 additions & 4 deletions src/firecracker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ bench = false
[dependencies]
displaydoc = "0.2.5"
event-manager = "0.4.0"
libc = "0.2.158"
libc = "0.2.159"
log-instrument = { path = "../log-instrument", optional = true }
micro_http = { git = "https://github.com/firecracker-microvm/micro-http" }

Expand All @@ -33,9 +33,9 @@ vmm = { path = "../vmm" }
vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }

[dev-dependencies]
cargo_toml = "0.20.4"
libc = "0.2.158"
regex = { version = "1.10.6", default-features = false, features = ["std", "unicode-perl"] }
cargo_toml = "0.20.5"
libc = "0.2.159"
regex = { version = "1.11.0", default-features = false, features = ["std", "unicode-perl"] }

# Dev-Dependencies for uffd examples
serde = { version = "1.0.210", features = ["derive"] }
Expand Down
4 changes: 2 additions & 2 deletions src/jailer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ name = "jailer"
bench = false

[dependencies]
libc = "0.2.158"
libc = "0.2.159"
log-instrument = { path = "../log-instrument", optional = true }
nix = { version = "0.29.0", default-features = false, features = ["dir"] }
regex = { version = "1.10.6", default-features = false, features = ["std"] }
regex = { version = "1.11.0", default-features = false, features = ["std"] }
thiserror = "1.0.64"
vmm-sys-util = "0.12.1"

Expand Down
2 changes: 1 addition & 1 deletion src/log-instrument-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ bench = false
[dependencies]
proc-macro2 = "1.0.86"
quote = "1.0.37"
syn = { version = "2.0.77", features = ["full", "extra-traits"] }
syn = { version = "2.0.79", features = ["full", "extra-traits"] }

[lints]
workspace = true
2 changes: 1 addition & 1 deletion src/rebase-snap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bench = false

[dependencies]
displaydoc = "0.2.5"
libc = "0.2.158"
libc = "0.2.159"
log-instrument = { path = "../log-instrument", optional = true }
thiserror = "1.0.64"
vmm-sys-util = "0.12.1"
Expand Down
2 changes: 1 addition & 1 deletion src/seccompiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ bench = false
[dependencies]
bincode = "1.2.1"
displaydoc = "0.2.5"
libc = "0.2.158"
libc = "0.2.159"
log-instrument = { path = "../log-instrument", optional = true }
serde = { version = "1.0.210", features = ["derive"] }
serde_json = "1.0.128"
Expand Down
2 changes: 1 addition & 1 deletion src/snapshot-editor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ clap = { version = "4.5.18", features = ["derive", "string"] }
displaydoc = "0.2.5"

fc_utils = { package = "utils", path = "../utils" }
libc = "0.2.158"
libc = "0.2.159"
log-instrument = { path = "../log-instrument", optional = true }
semver = "1.0.23"
thiserror = "1.0.64"
Expand Down
2 changes: 1 addition & 1 deletion src/utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bench = false
[dependencies]
derive_more = { version = "1.0.0", default-features = false, features = ["from"] }
displaydoc = "0.2.5"
libc = "0.2.158"
libc = "0.2.159"
log-instrument = { path = "../log-instrument", optional = true }
serde = { version = "1.0.210", features = ["derive"] }
thiserror = "1.0.64"
Expand Down
2 changes: 1 addition & 1 deletion src/vmm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ event-manager = "0.4.0"
kvm-bindings = { version = "0.9.1", features = ["fam-wrappers", "serde"] }
kvm-ioctls = "0.18.0"
lazy_static = "1.5.0"
libc = "0.2.158"
libc = "0.2.159"
linux-loader = "0.12.0"
log = { version = "0.4.22", features = ["std", "serde"] }
log-instrument = { path = "../log-instrument", optional = true }
Expand Down

0 comments on commit b5878a3

Please sign in to comment.