Skip to content

Commit 0ed6db6

Browse files
committed
Updates to make clippy and CI pass
Signed-off-by: James Sturtevant <jstur@microsoft.com>
1 parent 74ad024 commit 0ed6db6

4 files changed

Lines changed: 15 additions & 3 deletions

File tree

.github/workflows/dep_rust.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ jobs:
7676
with:
7777
name: guest-modules
7878
path: ./x64/${{ matrix.config }}
79+
80+
- name: Build Rust Wasi examples
81+
run: just build-rust-wasi-examples ${{ matrix.config }}
7982

8083
- name: Fmt
8184
run: just fmt-check

Justfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ build-rust-wasm-examples target=default-target: (mkdir-redist target)
3232
cp ./x64/{{ target }}/rust_wasm_samples.aot ./x64/{{ target }}/rust_wasm_samples.wasm
3333

3434
build-rust-wasi-examples target=default-target:
35+
wasm-tools component wit ./src/wasi_samples/wit/example.wit -w -o ./src/wasi_samples/wit/component-world.wasm
3536
# use cargo component so we don't get all the wasi imports https://github.com/bytecodealliance/cargo-component?tab=readme-ov-file#relationship-with-wasm32-wasip2
3637
# we also explicitly target wasm32-unknown-unknown since cargo component might try to pull in wasi imports https://github.com/bytecodealliance/cargo-component/issues/290
3738
rustup target add wasm32-unknown-unknown
@@ -60,6 +61,7 @@ fmt:
6061
clippy target=default-target: (check target)
6162
cargo clippy --profile={{ if target == "debug" {"dev"} else { target } }} --all-targets --all-features -- -D warnings
6263
cd src/rust_wasm_samples && cargo clippy --profile={{ if target == "debug" {"dev"} else { target } }} --all-targets --all-features -- -D warnings
64+
cd src/wasi_samples && cargo clippy --profile={{ if target == "debug" {"dev"} else { target } }} --all-targets --all-features -- -D warnings
6365
cd src/wasm_runtime && cargo clippy --profile={{ if target == "debug" {"dev"} else { target } }} --all-targets --all-features -- -D warnings
6466

6567
# TESTING
@@ -84,7 +86,6 @@ examples-ci target=default-target features="": (build-rust-wasm-examples target)
8486
cargo run {{ if features =="" {"--no-default-features --features kvm,mshv2"} else {"--no-default-features -F function_call_metrics," + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} --example metrics
8587

8688
examples-wasi target=default-target features="": (build-rust-wasi-examples target)
87-
wasm-tools component wit ./src/wasi_samples/wit/example.wit -w -o ./src/wasi_samples/wit/component-world.wasm
8889
WIT_WORLD={{ justfile_directory() }}/src/wasi_samples/wit/component-world.wasm cargo run {{ if features =="" {''} else {"--no-default-features -F " + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} --example wasi_examples
8990

9091
# warning, compares to and then OVERWRITES the given baseline

src/hyperlight_wasm/examples/wasi_examples/main.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,14 @@ impl State {
1313
}
1414
}
1515

16+
impl Default for State {
17+
fn default() -> Self {
18+
Self::new()
19+
}
20+
}
21+
1622
impl bindings::wasi_sample::example::Host for State {
17-
fn r#print(&mut self, message: alloc::string::String) -> () {
23+
fn r#print(&mut self, message: alloc::string::String) {
1824
println!("Logged from component: {message}");
1925
}
2026

src/wasi_samples/src/bindings.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,9 @@ macro_rules! __export_example_impl {
272272
#[doc(inline)]
273273
pub(crate) use __export_example_impl as export;
274274
#[cfg(target_arch = "wasm32")]
275-
#[unsafe(link_section = "component-type:wit-bindgen:0.41.0:wasi-sample:example:example:encoded world")]
275+
#[unsafe(
276+
link_section = "component-type:wit-bindgen:0.41.0:wasi-sample:example:example:encoded world"
277+
)]
276278
#[doc(hidden)]
277279
#[allow(clippy::octal_escapes)]
278280
pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 335] = *b"\

0 commit comments

Comments
 (0)