Skip to content

Commit 25393e4

Browse files
Copilotjsturtevant
andcommitted
Add log dependency to hyperlight_common for guest compatibility
Co-authored-by: jsturtevant <648372+jsturtevant@users.noreply.github.com>
1 parent 2f8187e commit 25393e4

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

Cargo.lock

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

src/hyperlight_common/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@ tracing = { version = "0.1.43", optional = true }
2121
arbitrary = {version = "1.4.2", optional = true, features = ["derive"]}
2222
spin = "0.10.0"
2323
thiserror = { version = "2.0.16", default-features = false }
24+
log = { version = "0.4.29", default-features = false }
2425

2526
[features]
2627
default = ["tracing"]
2728
tracing = ["dep:tracing"]
2829
fuzzing = ["dep:arbitrary"]
2930
trace_guest = []
3031
mem_profile = []
31-
std = ["thiserror/std", "tracing/std"]
32+
std = ["thiserror/std", "tracing/std", "log/std"]
3233

3334
[lib]
3435
bench = false # see https://bheisler.github.io/criterion.rs/book/faq.html#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options

src/hyperlight_common/src/flatbuffer_wrappers/guest_log_level.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ use anyhow::{Error, Result, bail};
1818
#[cfg(feature = "tracing")]
1919
use tracing::{Span, instrument};
2020

21-
#[cfg(feature = "std")]
22-
extern crate log;
23-
2421
use crate::flatbuffers::hyperlight::generated::LogLevel as FbLogLevel;
2522

2623
// Define a minimal Level enum for conversions.
@@ -127,8 +124,6 @@ impl From<Level> for LogLevel {
127124
}
128125

129126
// Conversion from log::Level (which guest logger uses) to LogLevel
130-
// Only available when std feature is enabled (for guest environments)
131-
#[cfg(feature = "std")]
132127
impl From<log::Level> for LogLevel {
133128
fn from(val: log::Level) -> LogLevel {
134129
match val {

src/hyperlight_guest_capi/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ hyperlight-guest-bin = { workspace = true, default-features = true }
1717
hyperlight-common = { workspace = true, default-features = false }
1818

1919
flatbuffers = { version = "25.2.10", default-features = false }
20+
log = { version = "0.4", default-features = false }
2021
tracing = { version = "0.1.43", default-features = false }
2122

2223
[build-dependencies]

src/tests/rust_guests/simpleguest/Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/tests/rust_guests/witguest/Cargo.lock

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)