From 9b8e0cfe6442735189362844bc2b8369dd342a37 Mon Sep 17 00:00:00 2001 From: Alex Snaps Date: Wed, 18 Sep 2024 07:26:32 -0400 Subject: [PATCH 1/2] Only enable minimum set of wasmtime features Signed-off-by: Alex Snaps --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 4f82b6d..a9bbb1b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -wasmtime = "23.0.1" +wasmtime = { version = "24.0.0", default-features = false, features = ["cranelift", "parallel-compilation", "std", "runtime"] } anyhow = "1.0.72" lazy_static = "1.4.0" more-asserts = "0.3.1" From c9c70620816831ef138bd151f9de8c47a1b05bef Mon Sep 17 00:00:00 2001 From: Alex Snaps Date: Wed, 18 Sep 2024 09:22:51 -0400 Subject: [PATCH 2/2] Add explicit lifetimes, fixing nightly Signed-off-by: Alex Snaps --- src/expect_interface.rs | 6 +++--- src/settings_interface.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/expect_interface.rs b/src/expect_interface.rs index a56b2aa..d258e1d 100644 --- a/src/expect_interface.rs +++ b/src/expect_interface.rs @@ -25,7 +25,7 @@ pub struct ExpectGetCurrentTimeNanos<'a> { } impl<'a> ExpectGetCurrentTimeNanos<'a> { - pub fn expecting(tester: &'a mut Tester) -> ExpectGetCurrentTimeNanos { + pub fn expecting(tester: &'a mut Tester) -> ExpectGetCurrentTimeNanos<'a> { ExpectGetCurrentTimeNanos { tester: tester } } @@ -44,7 +44,7 @@ pub struct ExpectGetBufferBytes<'a> { } impl<'a> ExpectGetBufferBytes<'a> { - pub fn expecting(tester: &'a mut Tester, buffer_type: Option) -> ExpectGetBufferBytes { + pub fn expecting(tester: &'a mut Tester, buffer_type: Option) -> ExpectGetBufferBytes<'a> { ExpectGetBufferBytes { tester: tester, buffer_type: buffer_type, @@ -66,7 +66,7 @@ pub struct ExpectGetHeaderMapPairs<'a> { } impl<'a> ExpectGetHeaderMapPairs<'a> { - pub fn expecting(tester: &'a mut Tester, map_type: Option) -> ExpectGetHeaderMapPairs { + pub fn expecting(tester: &'a mut Tester, map_type: Option) -> ExpectGetHeaderMapPairs<'a> { ExpectGetHeaderMapPairs { tester: tester, map_type: map_type, diff --git a/src/settings_interface.rs b/src/settings_interface.rs index 1d0ea54..7127a6c 100644 --- a/src/settings_interface.rs +++ b/src/settings_interface.rs @@ -20,7 +20,7 @@ pub struct DefaultBufferBytes<'a> { } impl<'a> DefaultBufferBytes<'a> { - pub fn expecting(tester: &'a mut Tester, buffer_type: i32) -> DefaultBufferBytes { + pub fn expecting(tester: &'a mut Tester, buffer_type: i32) -> DefaultBufferBytes<'a> { DefaultBufferBytes { tester: tester, buffer_type: buffer_type, @@ -42,7 +42,7 @@ pub struct DefaultHeaderMapPairs<'a> { } impl<'a> DefaultHeaderMapPairs<'a> { - pub fn expecting(tester: &'a mut Tester, map_type: i32) -> DefaultHeaderMapPairs { + pub fn expecting(tester: &'a mut Tester, map_type: i32) -> DefaultHeaderMapPairs<'a> { DefaultHeaderMapPairs { tester: tester, map_type: map_type,