Skip to content

Commit 86d06a4

Browse files
committed
feat(runtime-wasmtime): sync codec with latest spec changes
Signed-off-by: Roman Volosatovs <[email protected]>
1 parent 520e221 commit 86d06a4

File tree

3 files changed

+32
-8
lines changed

3 files changed

+32
-8
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ tower = { version = "0.4", default-features = false }
117117
tracing = { version = "0.1", default-features = false }
118118
tracing-subscriber = { version = "0.3", default-features = false }
119119
url = { version = "2", default-features = false }
120-
wasm-tokio = { version = "0.1", default-features = false }
120+
wasm-tokio = { version = "0.4", default-features = false }
121121
wasmcloud-component-adapters = { version = "0.9", default-features = false }
122122
wasmparser = { version = "0.208", default-features = false }
123123
wasmtime = { version = "21", default-features = false }

crates/runtime-wasmtime/src/lib.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![allow(clippy::type_complexity)] // TODO: https://github.com/wrpc/wrpc/issues/2
22

3-
use core::fmt::{self, Display};
43
use core::future::Future;
54
use core::iter::zip;
65
use core::ops::{BitOrAssign, Shl};
@@ -18,8 +17,11 @@ use tokio::try_join;
1817
use tokio_util::codec::Encoder;
1918
use tracing::{error, trace};
2019
use tracing::{instrument, warn};
21-
use wasm_tokio::cm::{AsyncReadValue as _, CharEncoder};
22-
use wasm_tokio::{AsyncReadCore as _, CoreStringEncoder, Leb128Encoder};
20+
use wasm_tokio::cm::AsyncReadValue as _;
21+
use wasm_tokio::{
22+
AsyncReadCore as _, AsyncReadLeb128 as _, AsyncReadUtf8 as _, CoreStringEncoder, Leb128Encoder,
23+
Utf8Encoder,
24+
};
2325
use wasmtime::component::types::{self, Case, Field};
2426
use wasmtime::component::{Linker, ResourceType, Type, Val};
2527
use wasmtime::{AsContextMut, StoreContextMut};
@@ -168,7 +170,7 @@ where
168170
Ok(())
169171
}
170172
(Val::Char(v), Type::Char) => {
171-
CharEncoder.encode(*v, dst).context("failed to encode char")
173+
Utf8Encoder.encode(*v, dst).context("failed to encode char")
172174
}
173175
(Val::String(v), Type::String) => CoreStringEncoder
174176
.encode(v.as_str(), dst)
@@ -582,7 +584,7 @@ where
582584
Ok(())
583585
}
584586
Type::Char => {
585-
let v = r.read_char().await?;
587+
let v = r.read_char_utf8().await?;
586588
*val = Val::Char(v);
587589
Ok(())
588590
}

0 commit comments

Comments
 (0)