diff --git a/Cargo.lock b/Cargo.lock index cb55afc8e..a0ce30814 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -621,14 +621,14 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" dependencies = [ "anstream", "anstyle", "env_filter", - "humantime", + "jiff", "log", ] @@ -900,12 +900,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hypervisor" version = "0.1.0" @@ -1030,6 +1024,30 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +[[package]] +name = "jiff" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde", +] + +[[package]] +name = "jiff-static" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "js-sys" version = "0.3.77" @@ -1626,6 +1644,21 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "portable-atomic" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" + +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + [[package]] name = "ppv-lite86" version = "0.2.20" diff --git a/Cargo.toml b/Cargo.toml index 0cc8e53a9..5f21b99a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -129,6 +129,7 @@ igvm_defs = { git = "https://github.com/microsoft/igvm", branch = "main" } serde_json = "1.0.120" # other crates +env_logger = "0.11.8" thiserror = "2.0.12" uuid = { version = "1.17.0" } zerocopy = { version = "0.8.26", default-features = false } diff --git a/hypervisor/Cargo.toml b/hypervisor/Cargo.toml index fed24b686..60f53c7d4 100644 --- a/hypervisor/Cargo.toml +++ b/hypervisor/Cargo.toml @@ -62,4 +62,4 @@ optional = true version = "1.21.0" [dev-dependencies] -env_logger = "0.11.3" +env_logger = { workspace = true } diff --git a/vhost_user_block/Cargo.toml b/vhost_user_block/Cargo.toml index 4c63cfa4d..d9aa7e105 100644 --- a/vhost_user_block/Cargo.toml +++ b/vhost_user_block/Cargo.toml @@ -8,7 +8,7 @@ version = "0.1.0" [dependencies] block = { path = "../block" } clap = { version = "4.5.13", features = ["cargo", "wrap_help"] } -env_logger = "0.11.3" +env_logger = { workspace = true } epoll = "4.3.3" libc = "0.2.167" log = "0.4.22" diff --git a/vhost_user_net/Cargo.toml b/vhost_user_net/Cargo.toml index d36763b79..515287e2c 100644 --- a/vhost_user_net/Cargo.toml +++ b/vhost_user_net/Cargo.toml @@ -7,7 +7,7 @@ version = "0.1.0" [dependencies] clap = { version = "4.5.13", features = ["cargo", "wrap_help"] } -env_logger = "0.11.3" +env_logger = { workspace = true } epoll = "4.3.3" libc = "0.2.167" log = "0.4.22"