Skip to content

A lightweight WebAssembly runtime that is fast, secure, and standards-compliant

Pass anonymous maps to exported functions by reference in bindgen! (#14838)

Randolf J.29508831556b
diff --git a/crates/component-macro/tests/expanded/map.rs b/crates/component-macro/tests/expanded/map.rs
index b08561ee21..07b46bce77 100644
--- a/crates/component-macro/tests/expanded/map.rs
+++ b/crates/component-macro/tests/expanded/map.rs
@@ -1079,7 +1079,12 @@ pub mod exports {
.func();
let bytes_roundtrip = *_instance
.get_typed_func::<
- (std::collections::HashMap<&str, &[u8]>,),
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ wasmtime::component::__internal::Vec<u8>,
+ >,
+ ),
(
std::collections::HashMap<
wasmtime::component::__internal::String,
@@ -1090,7 +1095,14 @@ pub mod exports {
.func();
let option_roundtrip = *_instance
.get_typed_func::<
- (Option<std::collections::HashMap<&str, u32>>,),
+ (
+ Option<
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ >,
+ ),
(
Option<
std::collections::HashMap<
@@ -1103,7 +1115,15 @@ pub mod exports {
.func();
let result_roundtrip = *_instance
.get_typed_func::<
- (Result<std::collections::HashMap<u32, &str>, &str>,),
+ (
+ Result<
+ &std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
+ &str,
+ >,
+ ),
(
Result<
std::collections::HashMap<
@@ -1117,7 +1137,15 @@ pub mod exports {
.func();
let tuple_roundtrip = *_instance
.get_typed_func::<
- ((std::collections::HashMap<&str, u32>, u64),),
+ (
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ u64,
+ ),
+ ),
(
(
std::collections::HashMap<
@@ -1132,9 +1160,12 @@ pub mod exports {
let nested_roundtrip = *_instance
.get_typed_func::<
(
- std::collections::HashMap<
- &str,
- std::collections::HashMap<u32, &str>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
>,
),
(
@@ -1181,17 +1212,20 @@ pub mod exports {
let all_key_types = *_instance
.get_typed_func::<
(
- std::collections::HashMap<bool, u32>,
- std::collections::HashMap<u8, u32>,
- std::collections::HashMap<i8, u32>,
- std::collections::HashMap<u16, u32>,
- std::collections::HashMap<i16, u32>,
- std::collections::HashMap<u32, u32>,
- std::collections::HashMap<i32, u32>,
- std::collections::HashMap<u64, u32>,
- std::collections::HashMap<i64, u32>,
- std::collections::HashMap<char, u32>,
- std::collections::HashMap<&str, u32>,
+ &std::collections::HashMap<bool, u32>,
+ &std::collections::HashMap<u8, u32>,
+ &std::collections::HashMap<i8, u32>,
+ &std::collections::HashMap<u16, u32>,
+ &std::collections::HashMap<i16, u32>,
+ &std::collections::HashMap<u32, u32>,
+ &std::collections::HashMap<i32, u32>,
+ &std::collections::HashMap<u64, u32>,
+ &std::collections::HashMap<i64, u32>,
+ &std::collections::HashMap<char, u32>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
),
(),
>(&mut store, &self.all_key_types)?
@@ -1199,8 +1233,8 @@ pub mod exports {
let own_values = *_instance
.get_typed_func::<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -1215,8 +1249,8 @@ pub mod exports {
let borrowed_values = *_instance
.get_typed_func::<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -1262,7 +1296,12 @@ pub mod exports {
pub fn func_bytes_roundtrip(
&self,
) -> wasmtime::component::TypedFunc<
- (std::collections::HashMap<&str, &[u8]>,),
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ wasmtime::component::__internal::Vec<u8>,
+ >,
+ ),
(
std::collections::HashMap<
wasmtime::component::__internal::String,
@@ -1272,7 +1311,12 @@ pub mod exports {
> {
unsafe {
wasmtime::component::TypedFunc::<
- (std::collections::HashMap<&str, &[u8]>,),
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ wasmtime::component::__internal::Vec<u8>,
+ >,
+ ),
(
std::collections::HashMap<
wasmtime::component::__internal::String,
@@ -1285,7 +1329,10 @@ pub mod exports {
pub fn call_bytes_roundtrip<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: std::collections::HashMap<&str, &[u8]>,
+ arg0: &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ wasmtime::component::__internal::Vec<u8>,
+ >,
) -> wasmtime::Result<
std::collections::HashMap<
wasmtime::component::__internal::String,
@@ -1299,7 +1346,14 @@ pub mod exports {
pub fn func_option_roundtrip(
&self,
) -> wasmtime::component::TypedFunc<
- (Option<std::collections::HashMap<&str, u32>>,),
+ (
+ Option<
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ >,
+ ),
(
Option<
std::collections::HashMap<
@@ -1311,7 +1365,14 @@ pub mod exports {
> {
unsafe {
wasmtime::component::TypedFunc::<
- (Option<std::collections::HashMap<&str, u32>>,),
+ (
+ Option<
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ >,
+ ),
(
Option<
std::collections::HashMap<
@@ -1326,7 +1387,12 @@ pub mod exports {
pub fn call_option_roundtrip<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: Option<std::collections::HashMap<&str, u32>>,
+ arg0: Option<
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ >,
) -> wasmtime::Result<
Option<
std::collections::HashMap<
@@ -1342,7 +1408,15 @@ pub mod exports {
pub fn func_result_roundtrip(
&self,
) -> wasmtime::component::TypedFunc<
- (Result<std::collections::HashMap<u32, &str>, &str>,),
+ (
+ Result<
+ &std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
+ &str,
+ >,
+ ),
(
Result<
std::collections::HashMap<
@@ -1355,7 +1429,15 @@ pub mod exports {
> {
unsafe {
wasmtime::component::TypedFunc::<
- (Result<std::collections::HashMap<u32, &str>, &str>,),
+ (
+ Result<
+ &std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
+ &str,
+ >,
+ ),
(
Result<
std::collections::HashMap<
@@ -1371,7 +1453,13 @@ pub mod exports {
pub fn call_result_roundtrip<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: Result<std::collections::HashMap<u32, &str>, &str>,
+ arg0: Result<
+ &std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
+ &str,
+ >,
) -> wasmtime::Result<
Result<
std::collections::HashMap<
@@ -1388,7 +1476,15 @@ pub mod exports {
pub fn func_tuple_roundtrip(
&self,
) -> wasmtime::component::TypedFunc<
- ((std::collections::HashMap<&str, u32>, u64),),
+ (
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ u64,
+ ),
+ ),
(
(
std::collections::HashMap<
@@ -1401,7 +1497,15 @@ pub mod exports {
> {
unsafe {
wasmtime::component::TypedFunc::<
- ((std::collections::HashMap<&str, u32>, u64),),
+ (
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ u64,
+ ),
+ ),
(
(
std::collections::HashMap<
@@ -1417,7 +1521,13 @@ pub mod exports {
pub fn call_tuple_roundtrip<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: (std::collections::HashMap<&str, u32>, u64),
+ arg0: (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ u64,
+ ),
) -> wasmtime::Result<
(
std::collections::HashMap<
@@ -1435,9 +1545,12 @@ pub mod exports {
&self,
) -> wasmtime::component::TypedFunc<
(
- std::collections::HashMap<
- &str,
- std::collections::HashMap<u32, &str>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
>,
),
(
@@ -1453,9 +1566,12 @@ pub mod exports {
unsafe {
wasmtime::component::TypedFunc::<
(
- std::collections::HashMap<
- &str,
- std::collections::HashMap<u32, &str>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
>,
),
(
@@ -1473,9 +1589,12 @@ pub mod exports {
pub fn call_nested_roundtrip<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: std::collections::HashMap<
- &str,
- std::collections::HashMap<u32, &str>,
+ arg0: &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
>,
) -> wasmtime::Result<
std::collections::HashMap<
@@ -1594,34 +1713,40 @@ pub mod exports {
&self,
) -> wasmtime::component::TypedFunc<
(
- std::collections::HashMap<bool, u32>,
- std::collections::HashMap<u8, u32>,
- std::collections::HashMap<i8, u32>,
- std::collections::HashMap<u16, u32>,
- std::collections::HashMap<i16, u32>,
- std::collections::HashMap<u32, u32>,
- std::collections::HashMap<i32, u32>,
- std::collections::HashMap<u64, u32>,
- std::collections::HashMap<i64, u32>,
- std::collections::HashMap<char, u32>,
- std::collections::HashMap<&str, u32>,
+ &std::collections::HashMap<bool, u32>,
+ &std::collections::HashMap<u8, u32>,
+ &std::collections::HashMap<i8, u32>,
+ &std::collections::HashMap<u16, u32>,
+ &std::collections::HashMap<i16, u32>,
+ &std::collections::HashMap<u32, u32>,
+ &std::collections::HashMap<i32, u32>,
+ &std::collections::HashMap<u64, u32>,
+ &std::collections::HashMap<i64, u32>,
+ &std::collections::HashMap<char, u32>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
),
(),
> {
unsafe {
wasmtime::component::TypedFunc::<
(
- std::collections::HashMap<bool, u32>,
- std::collections::HashMap<u8, u32>,
- std::collections::HashMap<i8, u32>,
- std::collections::HashMap<u16, u32>,
- std::collections::HashMap<i16, u32>,
- std::collections::HashMap<u32, u32>,
- std::collections::HashMap<i32, u32>,
- std::collections::HashMap<u64, u32>,
- std::collections::HashMap<i64, u32>,
- std::collections::HashMap<char, u32>,
- std::collections::HashMap<&str, u32>,
+ &std::collections::HashMap<bool, u32>,
+ &std::collections::HashMap<u8, u32>,
+ &std::collections::HashMap<i8, u32>,
+ &std::collections::HashMap<u16, u32>,
+ &std::collections::HashMap<i16, u32>,
+ &std::collections::HashMap<u32, u32>,
+ &std::collections::HashMap<i32, u32>,
+ &std::collections::HashMap<u64, u32>,
+ &std::collections::HashMap<i64, u32>,
+ &std::collections::HashMap<char, u32>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
),
(),
>::new_unchecked(self.all_key_types)
@@ -1630,17 +1755,20 @@ pub mod exports {
pub fn call_all_key_types<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: std::collections::HashMap<bool, u32>,
- arg1: std::collections::HashMap<u8, u32>,
- arg2: std::collections::HashMap<i8, u32>,
- arg3: std::collections::HashMap<u16, u32>,
- arg4: std::collections::HashMap<i16, u32>,
- arg5: std::collections::HashMap<u32, u32>,
- arg6: std::collections::HashMap<i32, u32>,
- arg7: std::collections::HashMap<u64, u32>,
- arg8: std::collections::HashMap<i64, u32>,
- arg9: std::collections::HashMap<char, u32>,
- arg10: std::collections::HashMap<&str, u32>,
+ arg0: &std::collections::HashMap<bool, u32>,
+ arg1: &std::collections::HashMap<u8, u32>,
+ arg2: &std::collections::HashMap<i8, u32>,
+ arg3: &std::collections::HashMap<u16, u32>,
+ arg4: &std::collections::HashMap<i16, u32>,
+ arg5: &std::collections::HashMap<u32, u32>,
+ arg6: &std::collections::HashMap<i32, u32>,
+ arg7: &std::collections::HashMap<u64, u32>,
+ arg8: &std::collections::HashMap<i64, u32>,
+ arg9: &std::collections::HashMap<char, u32>,
+ arg10: &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
) -> wasmtime::Result<()> {
let callee = self.func_all_key_types();
let () = callee
@@ -1666,8 +1794,8 @@ pub mod exports {
&self,
) -> wasmtime::component::TypedFunc<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -1681,8 +1809,8 @@ pub mod exports {
unsafe {
wasmtime::component::TypedFunc::<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -1698,8 +1826,8 @@ pub mod exports {
pub fn call_own_values<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: std::collections::HashMap<
- &str,
+ arg0: &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
) -> wasmtime::Result<
@@ -1716,8 +1844,8 @@ pub mod exports {
&self,
) -> wasmtime::component::TypedFunc<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -1726,8 +1854,8 @@ pub mod exports {
unsafe {
wasmtime::component::TypedFunc::<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -1738,8 +1866,8 @@ pub mod exports {
pub fn call_borrowed_values<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: std::collections::HashMap<
- &str,
+ arg0: &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
) -> wasmtime::Result<()> {
diff --git a/crates/component-macro/tests/expanded/map_async.rs b/crates/component-macro/tests/expanded/map_async.rs
index 9d6fb5cd53..52ffe39919 100644
--- a/crates/component-macro/tests/expanded/map_async.rs
+++ b/crates/component-macro/tests/expanded/map_async.rs
@@ -1157,7 +1157,12 @@ pub mod exports {
.func();
let bytes_roundtrip = *_instance
.get_typed_func::<
- (std::collections::HashMap<&str, &[u8]>,),
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ wasmtime::component::__internal::Vec<u8>,
+ >,
+ ),
(
std::collections::HashMap<
wasmtime::component::__internal::String,
@@ -1168,7 +1173,14 @@ pub mod exports {
.func();
let option_roundtrip = *_instance
.get_typed_func::<
- (Option<std::collections::HashMap<&str, u32>>,),
+ (
+ Option<
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ >,
+ ),
(
Option<
std::collections::HashMap<
@@ -1181,7 +1193,15 @@ pub mod exports {
.func();
let result_roundtrip = *_instance
.get_typed_func::<
- (Result<std::collections::HashMap<u32, &str>, &str>,),
+ (
+ Result<
+ &std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
+ &str,
+ >,
+ ),
(
Result<
std::collections::HashMap<
@@ -1195,7 +1215,15 @@ pub mod exports {
.func();
let tuple_roundtrip = *_instance
.get_typed_func::<
- ((std::collections::HashMap<&str, u32>, u64),),
+ (
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ u64,
+ ),
+ ),
(
(
std::collections::HashMap<
@@ -1210,9 +1238,12 @@ pub mod exports {
let nested_roundtrip = *_instance
.get_typed_func::<
(
- std::collections::HashMap<
- &str,
- std::collections::HashMap<u32, &str>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
>,
),
(
@@ -1259,17 +1290,20 @@ pub mod exports {
let all_key_types = *_instance
.get_typed_func::<
(
- std::collections::HashMap<bool, u32>,
- std::collections::HashMap<u8, u32>,
- std::collections::HashMap<i8, u32>,
- std::collections::HashMap<u16, u32>,
- std::collections::HashMap<i16, u32>,
- std::collections::HashMap<u32, u32>,
- std::collections::HashMap<i32, u32>,
- std::collections::HashMap<u64, u32>,
- std::collections::HashMap<i64, u32>,
- std::collections::HashMap<char, u32>,
- std::collections::HashMap<&str, u32>,
+ &std::collections::HashMap<bool, u32>,
+ &std::collections::HashMap<u8, u32>,
+ &std::collections::HashMap<i8, u32>,
+ &std::collections::HashMap<u16, u32>,
+ &std::collections::HashMap<i16, u32>,
+ &std::collections::HashMap<u32, u32>,
+ &std::collections::HashMap<i32, u32>,
+ &std::collections::HashMap<u64, u32>,
+ &std::collections::HashMap<i64, u32>,
+ &std::collections::HashMap<char, u32>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
),
(),
>(&mut store, &self.all_key_types)?
@@ -1277,8 +1311,8 @@ pub mod exports {
let own_values = *_instance
.get_typed_func::<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -1293,8 +1327,8 @@ pub mod exports {
let borrowed_values = *_instance
.get_typed_func::<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -1345,7 +1379,12 @@ pub mod exports {
pub fn func_bytes_roundtrip(
&self,
) -> wasmtime::component::TypedFunc<
- (std::collections::HashMap<&str, &[u8]>,),
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ wasmtime::component::__internal::Vec<u8>,
+ >,
+ ),
(
std::collections::HashMap<
wasmtime::component::__internal::String,
@@ -1355,7 +1394,12 @@ pub mod exports {
> {
unsafe {
wasmtime::component::TypedFunc::<
- (std::collections::HashMap<&str, &[u8]>,),
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ wasmtime::component::__internal::Vec<u8>,
+ >,
+ ),
(
std::collections::HashMap<
wasmtime::component::__internal::String,
@@ -1368,7 +1412,10 @@ pub mod exports {
pub async fn call_bytes_roundtrip<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: std::collections::HashMap<&str, &[u8]>,
+ arg0: &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ wasmtime::component::__internal::Vec<u8>,
+ >,
) -> wasmtime::Result<
std::collections::HashMap<
wasmtime::component::__internal::String,
@@ -1387,7 +1434,14 @@ pub mod exports {
pub fn func_option_roundtrip(
&self,
) -> wasmtime::component::TypedFunc<
- (Option<std::collections::HashMap<&str, u32>>,),
+ (
+ Option<
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ >,
+ ),
(
Option<
std::collections::HashMap<
@@ -1399,7 +1453,14 @@ pub mod exports {
> {
unsafe {
wasmtime::component::TypedFunc::<
- (Option<std::collections::HashMap<&str, u32>>,),
+ (
+ Option<
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ >,
+ ),
(
Option<
std::collections::HashMap<
@@ -1414,7 +1475,12 @@ pub mod exports {
pub async fn call_option_roundtrip<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: Option<std::collections::HashMap<&str, u32>>,
+ arg0: Option<
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ >,
) -> wasmtime::Result<
Option<
std::collections::HashMap<
@@ -1435,7 +1501,15 @@ pub mod exports {
pub fn func_result_roundtrip(
&self,
) -> wasmtime::component::TypedFunc<
- (Result<std::collections::HashMap<u32, &str>, &str>,),
+ (
+ Result<
+ &std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
+ &str,
+ >,
+ ),
(
Result<
std::collections::HashMap<
@@ -1448,7 +1522,15 @@ pub mod exports {
> {
unsafe {
wasmtime::component::TypedFunc::<
- (Result<std::collections::HashMap<u32, &str>, &str>,),
+ (
+ Result<
+ &std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
+ &str,
+ >,
+ ),
(
Result<
std::collections::HashMap<
@@ -1464,7 +1546,13 @@ pub mod exports {
pub async fn call_result_roundtrip<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: Result<std::collections::HashMap<u32, &str>, &str>,
+ arg0: Result<
+ &std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
+ &str,
+ >,
) -> wasmtime::Result<
Result<
std::collections::HashMap<
@@ -1486,7 +1574,15 @@ pub mod exports {
pub fn func_tuple_roundtrip(
&self,
) -> wasmtime::component::TypedFunc<
- ((std::collections::HashMap<&str, u32>, u64),),
+ (
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ u64,
+ ),
+ ),
(
(
std::collections::HashMap<
@@ -1499,7 +1595,15 @@ pub mod exports {
> {
unsafe {
wasmtime::component::TypedFunc::<
- ((std::collections::HashMap<&str, u32>, u64),),
+ (
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ u64,
+ ),
+ ),
(
(
std::collections::HashMap<
@@ -1515,7 +1619,13 @@ pub mod exports {
pub async fn call_tuple_roundtrip<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: (std::collections::HashMap<&str, u32>, u64),
+ arg0: (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ u64,
+ ),
) -> wasmtime::Result<
(
std::collections::HashMap<
@@ -1538,9 +1648,12 @@ pub mod exports {
&self,
) -> wasmtime::component::TypedFunc<
(
- std::collections::HashMap<
- &str,
- std::collections::HashMap<u32, &str>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
>,
),
(
@@ -1556,9 +1669,12 @@ pub mod exports {
unsafe {
wasmtime::component::TypedFunc::<
(
- std::collections::HashMap<
- &str,
- std::collections::HashMap<u32, &str>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
>,
),
(
@@ -1576,9 +1692,12 @@ pub mod exports {
pub async fn call_nested_roundtrip<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: std::collections::HashMap<
- &str,
- std::collections::HashMap<u32, &str>,
+ arg0: &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
>,
) -> wasmtime::Result<
std::collections::HashMap<
@@ -1717,34 +1836,40 @@ pub mod exports {
&self,
) -> wasmtime::component::TypedFunc<
(
- std::collections::HashMap<bool, u32>,
- std::collections::HashMap<u8, u32>,
- std::collections::HashMap<i8, u32>,
- std::collections::HashMap<u16, u32>,
- std::collections::HashMap<i16, u32>,
- std::collections::HashMap<u32, u32>,
- std::collections::HashMap<i32, u32>,
- std::collections::HashMap<u64, u32>,
- std::collections::HashMap<i64, u32>,
- std::collections::HashMap<char, u32>,
- std::collections::HashMap<&str, u32>,
+ &std::collections::HashMap<bool, u32>,
+ &std::collections::HashMap<u8, u32>,
+ &std::collections::HashMap<i8, u32>,
+ &std::collections::HashMap<u16, u32>,
+ &std::collections::HashMap<i16, u32>,
+ &std::collections::HashMap<u32, u32>,
+ &std::collections::HashMap<i32, u32>,
+ &std::collections::HashMap<u64, u32>,
+ &std::collections::HashMap<i64, u32>,
+ &std::collections::HashMap<char, u32>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
),
(),
> {
unsafe {
wasmtime::component::TypedFunc::<
(
- std::collections::HashMap<bool, u32>,
- std::collections::HashMap<u8, u32>,
- std::collections::HashMap<i8, u32>,
- std::collections::HashMap<u16, u32>,
- std::collections::HashMap<i16, u32>,
- std::collections::HashMap<u32, u32>,
- std::collections::HashMap<i32, u32>,
- std::collections::HashMap<u64, u32>,
- std::collections::HashMap<i64, u32>,
- std::collections::HashMap<char, u32>,
- std::collections::HashMap<&str, u32>,
+ &std::collections::HashMap<bool, u32>,
+ &std::collections::HashMap<u8, u32>,
+ &std::collections::HashMap<i8, u32>,
+ &std::collections::HashMap<u16, u32>,
+ &std::collections::HashMap<i16, u32>,
+ &std::collections::HashMap<u32, u32>,
+ &std::collections::HashMap<i32, u32>,
+ &std::collections::HashMap<u64, u32>,
+ &std::collections::HashMap<i64, u32>,
+ &std::collections::HashMap<char, u32>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
),
(),
>::new_unchecked(self.all_key_types)
@@ -1753,17 +1878,20 @@ pub mod exports {
pub async fn call_all_key_types<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: std::collections::HashMap<bool, u32>,
- arg1: std::collections::HashMap<u8, u32>,
- arg2: std::collections::HashMap<i8, u32>,
- arg3: std::collections::HashMap<u16, u32>,
- arg4: std::collections::HashMap<i16, u32>,
- arg5: std::collections::HashMap<u32, u32>,
- arg6: std::collections::HashMap<i32, u32>,
- arg7: std::collections::HashMap<u64, u32>,
- arg8: std::collections::HashMap<i64, u32>,
- arg9: std::collections::HashMap<char, u32>,
- arg10: std::collections::HashMap<&str, u32>,
+ arg0: &std::collections::HashMap<bool, u32>,
+ arg1: &std::collections::HashMap<u8, u32>,
+ arg2: &std::collections::HashMap<i8, u32>,
+ arg3: &std::collections::HashMap<u16, u32>,
+ arg4: &std::collections::HashMap<i16, u32>,
+ arg5: &std::collections::HashMap<u32, u32>,
+ arg6: &std::collections::HashMap<i32, u32>,
+ arg7: &std::collections::HashMap<u64, u32>,
+ arg8: &std::collections::HashMap<i64, u32>,
+ arg9: &std::collections::HashMap<char, u32>,
+ arg10: &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
) -> wasmtime::Result<()>
where
<S as wasmtime::AsContext>::Data: Send,
@@ -1793,8 +1921,8 @@ pub mod exports {
&self,
) -> wasmtime::component::TypedFunc<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -1808,8 +1936,8 @@ pub mod exports {
unsafe {
wasmtime::component::TypedFunc::<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -1825,8 +1953,8 @@ pub mod exports {
pub async fn call_own_values<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: std::collections::HashMap<
- &str,
+ arg0: &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
) -> wasmtime::Result<
@@ -1848,8 +1976,8 @@ pub mod exports {
&self,
) -> wasmtime::component::TypedFunc<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -1858,8 +1986,8 @@ pub mod exports {
unsafe {
wasmtime::component::TypedFunc::<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -1870,8 +1998,8 @@ pub mod exports {
pub async fn call_borrowed_values<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: std::collections::HashMap<
- &str,
+ arg0: &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
) -> wasmtime::Result<()>
diff --git a/crates/component-macro/tests/expanded/map_concurrent.rs b/crates/component-macro/tests/expanded/map_concurrent.rs
index 69f19e2291..ab9706955e 100644
--- a/crates/component-macro/tests/expanded/map_concurrent.rs
+++ b/crates/component-macro/tests/expanded/map_concurrent.rs
@@ -1061,7 +1061,12 @@ pub mod exports {
.func();
let bytes_roundtrip = *_instance
.get_typed_func::<
- (std::collections::HashMap<&str, &[u8]>,),
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ wasmtime::component::__internal::Vec<u8>,
+ >,
+ ),
(
std::collections::HashMap<
wasmtime::component::__internal::String,
@@ -1072,7 +1077,14 @@ pub mod exports {
.func();
let option_roundtrip = *_instance
.get_typed_func::<
- (Option<std::collections::HashMap<&str, u32>>,),
+ (
+ Option<
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ >,
+ ),
(
Option<
std::collections::HashMap<
@@ -1085,7 +1097,15 @@ pub mod exports {
.func();
let result_roundtrip = *_instance
.get_typed_func::<
- (Result<std::collections::HashMap<u32, &str>, &str>,),
+ (
+ Result<
+ &std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
+ &str,
+ >,
+ ),
(
Result<
std::collections::HashMap<
@@ -1099,7 +1119,15 @@ pub mod exports {
.func();
let tuple_roundtrip = *_instance
.get_typed_func::<
- ((std::collections::HashMap<&str, u32>, u64),),
+ (
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ u64,
+ ),
+ ),
(
(
std::collections::HashMap<
@@ -1114,9 +1142,12 @@ pub mod exports {
let nested_roundtrip = *_instance
.get_typed_func::<
(
- std::collections::HashMap<
- &str,
- std::collections::HashMap<u32, &str>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
>,
),
(
@@ -1163,17 +1194,20 @@ pub mod exports {
let all_key_types = *_instance
.get_typed_func::<
(
- std::collections::HashMap<bool, u32>,
- std::collections::HashMap<u8, u32>,
- std::collections::HashMap<i8, u32>,
- std::collections::HashMap<u16, u32>,
- std::collections::HashMap<i16, u32>,
- std::collections::HashMap<u32, u32>,
- std::collections::HashMap<i32, u32>,
- std::collections::HashMap<u64, u32>,
- std::collections::HashMap<i64, u32>,
- std::collections::HashMap<char, u32>,
- std::collections::HashMap<&str, u32>,
+ &std::collections::HashMap<bool, u32>,
+ &std::collections::HashMap<u8, u32>,
+ &std::collections::HashMap<i8, u32>,
+ &std::collections::HashMap<u16, u32>,
+ &std::collections::HashMap<i16, u32>,
+ &std::collections::HashMap<u32, u32>,
+ &std::collections::HashMap<i32, u32>,
+ &std::collections::HashMap<u64, u32>,
+ &std::collections::HashMap<i64, u32>,
+ &std::collections::HashMap<char, u32>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
),
(),
>(&mut store, &self.all_key_types)?
@@ -1181,8 +1215,8 @@ pub mod exports {
let own_values = *_instance
.get_typed_func::<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -1197,8 +1231,8 @@ pub mod exports {
let borrowed_values = *_instance
.get_typed_func::<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
diff --git a/crates/component-macro/tests/expanded/map_tracing_async.rs b/crates/component-macro/tests/expanded/map_tracing_async.rs
index 538d7e64db..5057b69205 100644
--- a/crates/component-macro/tests/expanded/map_tracing_async.rs
+++ b/crates/component-macro/tests/expanded/map_tracing_async.rs
@@ -1355,7 +1355,12 @@ pub mod exports {
.func();
let bytes_roundtrip = *_instance
.get_typed_func::<
- (std::collections::HashMap<&str, &[u8]>,),
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ wasmtime::component::__internal::Vec<u8>,
+ >,
+ ),
(
std::collections::HashMap<
wasmtime::component::__internal::String,
@@ -1366,7 +1371,14 @@ pub mod exports {
.func();
let option_roundtrip = *_instance
.get_typed_func::<
- (Option<std::collections::HashMap<&str, u32>>,),
+ (
+ Option<
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ >,
+ ),
(
Option<
std::collections::HashMap<
@@ -1379,7 +1391,15 @@ pub mod exports {
.func();
let result_roundtrip = *_instance
.get_typed_func::<
- (Result<std::collections::HashMap<u32, &str>, &str>,),
+ (
+ Result<
+ &std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
+ &str,
+ >,
+ ),
(
Result<
std::collections::HashMap<
@@ -1393,7 +1413,15 @@ pub mod exports {
.func();
let tuple_roundtrip = *_instance
.get_typed_func::<
- ((std::collections::HashMap<&str, u32>, u64),),
+ (
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ u64,
+ ),
+ ),
(
(
std::collections::HashMap<
@@ -1408,9 +1436,12 @@ pub mod exports {
let nested_roundtrip = *_instance
.get_typed_func::<
(
- std::collections::HashMap<
- &str,
- std::collections::HashMap<u32, &str>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
>,
),
(
@@ -1457,17 +1488,20 @@ pub mod exports {
let all_key_types = *_instance
.get_typed_func::<
(
- std::collections::HashMap<bool, u32>,
- std::collections::HashMap<u8, u32>,
- std::collections::HashMap<i8, u32>,
- std::collections::HashMap<u16, u32>,
- std::collections::HashMap<i16, u32>,
- std::collections::HashMap<u32, u32>,
- std::collections::HashMap<i32, u32>,
- std::collections::HashMap<u64, u32>,
- std::collections::HashMap<i64, u32>,
- std::collections::HashMap<char, u32>,
- std::collections::HashMap<&str, u32>,
+ &std::collections::HashMap<bool, u32>,
+ &std::collections::HashMap<u8, u32>,
+ &std::collections::HashMap<i8, u32>,
+ &std::collections::HashMap<u16, u32>,
+ &std::collections::HashMap<i16, u32>,
+ &std::collections::HashMap<u32, u32>,
+ &std::collections::HashMap<i32, u32>,
+ &std::collections::HashMap<u64, u32>,
+ &std::collections::HashMap<i64, u32>,
+ &std::collections::HashMap<char, u32>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
),
(),
>(&mut store, &self.all_key_types)?
@@ -1475,8 +1509,8 @@ pub mod exports {
let own_values = *_instance
.get_typed_func::<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -1491,8 +1525,8 @@ pub mod exports {
let borrowed_values = *_instance
.get_typed_func::<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -1549,7 +1583,12 @@ pub mod exports {
pub fn func_bytes_roundtrip(
&self,
) -> wasmtime::component::TypedFunc<
- (std::collections::HashMap<&str, &[u8]>,),
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ wasmtime::component::__internal::Vec<u8>,
+ >,
+ ),
(
std::collections::HashMap<
wasmtime::component::__internal::String,
@@ -1559,7 +1598,12 @@ pub mod exports {
> {
unsafe {
wasmtime::component::TypedFunc::<
- (std::collections::HashMap<&str, &[u8]>,),
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ wasmtime::component::__internal::Vec<u8>,
+ >,
+ ),
(
std::collections::HashMap<
wasmtime::component::__internal::String,
@@ -1572,7 +1616,10 @@ pub mod exports {
pub async fn call_bytes_roundtrip<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: std::collections::HashMap<&str, &[u8]>,
+ arg0: &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ wasmtime::component::__internal::Vec<u8>,
+ >,
) -> wasmtime::Result<
std::collections::HashMap<
wasmtime::component::__internal::String,
@@ -1597,7 +1644,14 @@ pub mod exports {
pub fn func_option_roundtrip(
&self,
) -> wasmtime::component::TypedFunc<
- (Option<std::collections::HashMap<&str, u32>>,),
+ (
+ Option<
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ >,
+ ),
(
Option<
std::collections::HashMap<
@@ -1609,7 +1663,14 @@ pub mod exports {
> {
unsafe {
wasmtime::component::TypedFunc::<
- (Option<std::collections::HashMap<&str, u32>>,),
+ (
+ Option<
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ >,
+ ),
(
Option<
std::collections::HashMap<
@@ -1624,7 +1685,12 @@ pub mod exports {
pub async fn call_option_roundtrip<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: Option<std::collections::HashMap<&str, u32>>,
+ arg0: Option<
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ >,
) -> wasmtime::Result<
Option<
std::collections::HashMap<
@@ -1651,7 +1717,15 @@ pub mod exports {
pub fn func_result_roundtrip(
&self,
) -> wasmtime::component::TypedFunc<
- (Result<std::collections::HashMap<u32, &str>, &str>,),
+ (
+ Result<
+ &std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
+ &str,
+ >,
+ ),
(
Result<
std::collections::HashMap<
@@ -1664,7 +1738,15 @@ pub mod exports {
> {
unsafe {
wasmtime::component::TypedFunc::<
- (Result<std::collections::HashMap<u32, &str>, &str>,),
+ (
+ Result<
+ &std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
+ &str,
+ >,
+ ),
(
Result<
std::collections::HashMap<
@@ -1680,7 +1762,13 @@ pub mod exports {
pub async fn call_result_roundtrip<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: Result<std::collections::HashMap<u32, &str>, &str>,
+ arg0: Result<
+ &std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
+ &str,
+ >,
) -> wasmtime::Result<
Result<
std::collections::HashMap<
@@ -1708,7 +1796,15 @@ pub mod exports {
pub fn func_tuple_roundtrip(
&self,
) -> wasmtime::component::TypedFunc<
- ((std::collections::HashMap<&str, u32>, u64),),
+ (
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ u64,
+ ),
+ ),
(
(
std::collections::HashMap<
@@ -1721,7 +1817,15 @@ pub mod exports {
> {
unsafe {
wasmtime::component::TypedFunc::<
- ((std::collections::HashMap<&str, u32>, u64),),
+ (
+ (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ u64,
+ ),
+ ),
(
(
std::collections::HashMap<
@@ -1737,7 +1841,13 @@ pub mod exports {
pub async fn call_tuple_roundtrip<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: (std::collections::HashMap<&str, u32>, u64),
+ arg0: (
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
+ u64,
+ ),
) -> wasmtime::Result<
(
std::collections::HashMap<
@@ -1766,9 +1876,12 @@ pub mod exports {
&self,
) -> wasmtime::component::TypedFunc<
(
- std::collections::HashMap<
- &str,
- std::collections::HashMap<u32, &str>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
>,
),
(
@@ -1784,9 +1897,12 @@ pub mod exports {
unsafe {
wasmtime::component::TypedFunc::<
(
- std::collections::HashMap<
- &str,
- std::collections::HashMap<u32, &str>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
>,
),
(
@@ -1804,9 +1920,12 @@ pub mod exports {
pub async fn call_nested_roundtrip<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: std::collections::HashMap<
- &str,
- std::collections::HashMap<u32, &str>,
+ arg0: &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ std::collections::HashMap<
+ u32,
+ wasmtime::component::__internal::String,
+ >,
>,
) -> wasmtime::Result<
std::collections::HashMap<
@@ -1969,34 +2088,40 @@ pub mod exports {
&self,
) -> wasmtime::component::TypedFunc<
(
- std::collections::HashMap<bool, u32>,
- std::collections::HashMap<u8, u32>,
- std::collections::HashMap<i8, u32>,
- std::collections::HashMap<u16, u32>,
- std::collections::HashMap<i16, u32>,
- std::collections::HashMap<u32, u32>,
- std::collections::HashMap<i32, u32>,
- std::collections::HashMap<u64, u32>,
- std::collections::HashMap<i64, u32>,
- std::collections::HashMap<char, u32>,
- std::collections::HashMap<&str, u32>,
+ &std::collections::HashMap<bool, u32>,
+ &std::collections::HashMap<u8, u32>,
+ &std::collections::HashMap<i8, u32>,
+ &std::collections::HashMap<u16, u32>,
+ &std::collections::HashMap<i16, u32>,
+ &std::collections::HashMap<u32, u32>,
+ &std::collections::HashMap<i32, u32>,
+ &std::collections::HashMap<u64, u32>,
+ &std::collections::HashMap<i64, u32>,
+ &std::collections::HashMap<char, u32>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
),
(),
> {
unsafe {
wasmtime::component::TypedFunc::<
(
- std::collections::HashMap<bool, u32>,
- std::collections::HashMap<u8, u32>,
- std::collections::HashMap<i8, u32>,
- std::collections::HashMap<u16, u32>,
- std::collections::HashMap<i16, u32>,
- std::collections::HashMap<u32, u32>,
- std::collections::HashMap<i32, u32>,
- std::collections::HashMap<u64, u32>,
- std::collections::HashMap<i64, u32>,
- std::collections::HashMap<char, u32>,
- std::collections::HashMap<&str, u32>,
+ &std::collections::HashMap<bool, u32>,
+ &std::collections::HashMap<u8, u32>,
+ &std::collections::HashMap<i8, u32>,
+ &std::collections::HashMap<u16, u32>,
+ &std::collections::HashMap<i16, u32>,
+ &std::collections::HashMap<u32, u32>,
+ &std::collections::HashMap<i32, u32>,
+ &std::collections::HashMap<u64, u32>,
+ &std::collections::HashMap<i64, u32>,
+ &std::collections::HashMap<char, u32>,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
),
(),
>::new_unchecked(self.all_key_types)
@@ -2005,17 +2130,20 @@ pub mod exports {
pub async fn call_all_key_types<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: std::collections::HashMap<bool, u32>,
- arg1: std::collections::HashMap<u8, u32>,
- arg2: std::collections::HashMap<i8, u32>,
- arg3: std::collections::HashMap<u16, u32>,
- arg4: std::collections::HashMap<i16, u32>,
- arg5: std::collections::HashMap<u32, u32>,
- arg6: std::collections::HashMap<i32, u32>,
- arg7: std::collections::HashMap<u64, u32>,
- arg8: std::collections::HashMap<i64, u32>,
- arg9: std::collections::HashMap<char, u32>,
- arg10: std::collections::HashMap<&str, u32>,
+ arg0: &std::collections::HashMap<bool, u32>,
+ arg1: &std::collections::HashMap<u8, u32>,
+ arg2: &std::collections::HashMap<i8, u32>,
+ arg3: &std::collections::HashMap<u16, u32>,
+ arg4: &std::collections::HashMap<i16, u32>,
+ arg5: &std::collections::HashMap<u32, u32>,
+ arg6: &std::collections::HashMap<i32, u32>,
+ arg7: &std::collections::HashMap<u64, u32>,
+ arg8: &std::collections::HashMap<i64, u32>,
+ arg9: &std::collections::HashMap<char, u32>,
+ arg10: &std::collections::HashMap<
+ wasmtime::component::__internal::String,
+ u32,
+ >,
) -> wasmtime::Result<()>
where
<S as wasmtime::AsContext>::Data: Send,
@@ -2051,8 +2179,8 @@ pub mod exports {
&self,
) -> wasmtime::component::TypedFunc<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -2066,8 +2194,8 @@ pub mod exports {
unsafe {
wasmtime::component::TypedFunc::<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -2083,8 +2211,8 @@ pub mod exports {
pub async fn call_own_values<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: std::collections::HashMap<
- &str,
+ arg0: &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
) -> wasmtime::Result<
@@ -2112,8 +2240,8 @@ pub mod exports {
&self,
) -> wasmtime::component::TypedFunc<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -2122,8 +2250,8 @@ pub mod exports {
unsafe {
wasmtime::component::TypedFunc::<
(
- std::collections::HashMap<
- &str,
+ &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
),
@@ -2134,8 +2262,8 @@ pub mod exports {
pub async fn call_borrowed_values<S: wasmtime::AsContextMut>(
&self,
mut store: S,
- arg0: std::collections::HashMap<
- &str,
+ arg0: &std::collections::HashMap<
+ wasmtime::component::__internal::String,
wasmtime::component::ResourceAny,
>,
) -> wasmtime::Result<()>
diff --git a/crates/wit-bindgen/src/rust.rs b/crates/wit-bindgen/src/rust.rs
index e9cafa75e4..8e8b4d2234 100644
--- a/crates/wit-bindgen/src/rust.rs
+++ b/crates/wit-bindgen/src/rust.rs
@@ -188,11 +188,7 @@ pub trait RustGenerator<'a> {
TypeDefKind::Resource => unreachable!(),
TypeDefKind::Type(t) => self.ty(t, mode),
- TypeDefKind::Map(k, v) => {
- let key = self.ty(k, mode);
- let value = self.ty(v, mode);
- format!("std::collections::HashMap<{key}, {value}>")
- }
+ TypeDefKind::Map(k, v) => self.map(k, v, mode),
TypeDefKind::Unknown => unreachable!(),
TypeDefKind::FixedLengthList(t, size) => {
format!("[{}; {}]", self.ty(t, mode), size)
@@ -237,6 +233,27 @@ pub trait RustGenerator<'a> {
}
}
+ fn map(&self, key: &Type, value: &Type, mode: TypeMode) -> String {
+ let next_mode = if matches!(self.ownership(), Ownership::Owning) {
+ TypeMode::Owned
+ } else {
+ mode
+ };
+ let key = self.ty(key, next_mode);
+ let value = self.ty(value, next_mode);
+ let map = format!("std::collections::HashMap<{key}, {value}>");
+ match mode {
+ TypeMode::AllBorrowed(lt) => {
+ if lt != "'_" {
+ format!("&{lt} {map}")
+ } else {
+ format!("&{map}")
+ }
+ }
+ TypeMode::Owned => map,
+ }
+ }
+
fn print_stream(&mut self, ty: Option<&Type>) {
self.push_str(&self.stream(ty))
}