Skip to content

Commit 1112ac1

Browse files
alexcrichtonalexcrichton
authored
Revert "update component-model-async plumbing (#11123)" (#11192)
This reverts commit b221fca.
1 parent b63c25a commit 1112ac1

52 files changed

Lines changed: 1104 additions & 4166 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ rustix = { workspace = true, features = ["mm", "process"] }
9292

9393
[dev-dependencies]
9494
# depend again on wasmtime to activate its default features for tests
95-
wasmtime = { workspace = true, features = ['default', 'winch', 'pulley', 'all-arch', 'call-hook', 'memory-protection-keys', 'component-model-async'] }
95+
wasmtime = { workspace = true, features = ['default', 'winch', 'pulley', 'all-arch', 'call-hook', 'memory-protection-keys'] }
9696
env_logger = { workspace = true }
9797
log = { workspace = true }
9898
filecheck = { workspace = true }
@@ -129,7 +129,6 @@ wasmtime-test-macros = { path = "crates/test-macros" }
129129
pulley-interpreter = { workspace = true, features = ["disas"] }
130130
wasm-encoder = { workspace = true }
131131
cranelift-native = { workspace = true }
132-
futures = { workspace = true }
133132

134133
[target.'cfg(windows)'.dev-dependencies]
135134
windows-sys = { workspace = true, features = ["Win32_System_Memory"] }
@@ -324,7 +323,6 @@ io-extras = "0.18.1"
324323
rustix = "1.0.3"
325324
# wit-bindgen:
326325
wit-bindgen = { version = "0.43.0", default-features = false }
327-
wit-bindgen-rt = { version = "0.43.0", default-features = false }
328326
wit-bindgen-rust-macro = { version = "0.43.0", default-features = false }
329327

330328
# wasm-tools family:
@@ -338,7 +336,6 @@ wasm-mutate = "0.235.0"
338336
wit-parser = "0.235.0"
339337
wit-component = "0.235.0"
340338
wasm-wave = "0.235.0"
341-
wasm-compose = "0.235.0"
342339

343340
# Non-Bytecode Alliance maintained dependencies:
344341
# --------------------------
@@ -382,7 +379,7 @@ tempfile = "3.1.0"
382379
filecheck = "0.5.0"
383380
libc = { version = "0.2.112", default-features = true }
384381
file-per-thread-logger = "0.2.0"
385-
tokio = { version = "1.43.0", features = [ "rt", "time" ] }
382+
tokio = { version = "1.30.0", features = [ "rt", "time" ] }
386383
hyper = "1.0.1"
387384
http = "1.0.0"
388385
http-body = "1.0.0"

‎crates/c-api/src/component/val.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,6 @@ impl From<&Val> for wasmtime_component_val_t {
307307
Val::Result(x) => wasmtime_component_val_t::Result(x.into()),
308308
Val::Flags(x) => wasmtime_component_val_t::Flags(x.as_slice().into()),
309309
Val::Resource(_resource_any) => todo!(),
310-
Val::Future(_) => todo!(),
311-
Val::Stream(_) => todo!(),
312-
Val::ErrorContext(_) => todo!(),
313310
}
314311
}
315312
}

‎crates/component-macro/tests/expanded/char_concurrent.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -342,11 +342,10 @@ pub mod exports {
342342
(char,),
343343
>::new_unchecked(self.return_char)
344344
};
345-
let future = callee.call_concurrent(store.as_context_mut(), ());
346-
async move {
347-
let (ret0,) = future.await?;
348-
Ok(ret0)
349-
}
345+
wasmtime::component::__internal::FutureExt::map(
346+
callee.call_concurrent(store.as_context_mut(), ()),
347+
|v| v.map(|(v,)| v),
348+
)
350349
}
351350
}
352351
}

‎crates/component-macro/tests/expanded/flags_concurrent.rs‎

Lines changed: 28 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -771,12 +771,10 @@ pub mod exports {
771771
(Flag1,),
772772
>::new_unchecked(self.roundtrip_flag1)
773773
};
774-
let future = callee
775-
.call_concurrent(store.as_context_mut(), (arg0,));
776-
async move {
777-
let (ret0,) = future.await?;
778-
Ok(ret0)
779-
}
774+
wasmtime::component::__internal::FutureExt::map(
775+
callee.call_concurrent(store.as_context_mut(), (arg0,)),
776+
|v| v.map(|(v,)| v),
777+
)
780778
}
781779
pub fn call_roundtrip_flag2<S: wasmtime::AsContextMut>(
782780
&self,
@@ -794,12 +792,10 @@ pub mod exports {
794792
(Flag2,),
795793
>::new_unchecked(self.roundtrip_flag2)
796794
};
797-
let future = callee
798-
.call_concurrent(store.as_context_mut(), (arg0,));
799-
async move {
800-
let (ret0,) = future.await?;
801-
Ok(ret0)
802-
}
795+
wasmtime::component::__internal::FutureExt::map(
796+
callee.call_concurrent(store.as_context_mut(), (arg0,)),
797+
|v| v.map(|(v,)| v),
798+
)
803799
}
804800
pub fn call_roundtrip_flag4<S: wasmtime::AsContextMut>(
805801
&self,
@@ -817,12 +813,10 @@ pub mod exports {
817813
(Flag4,),
818814
>::new_unchecked(self.roundtrip_flag4)
819815
};
820-
let future = callee
821-
.call_concurrent(store.as_context_mut(), (arg0,));
822-
async move {
823-
let (ret0,) = future.await?;
824-
Ok(ret0)
825-
}
816+
wasmtime::component::__internal::FutureExt::map(
817+
callee.call_concurrent(store.as_context_mut(), (arg0,)),
818+
|v| v.map(|(v,)| v),
819+
)
826820
}
827821
pub fn call_roundtrip_flag8<S: wasmtime::AsContextMut>(
828822
&self,
@@ -840,12 +834,10 @@ pub mod exports {
840834
(Flag8,),
841835
>::new_unchecked(self.roundtrip_flag8)
842836
};
843-
let future = callee
844-
.call_concurrent(store.as_context_mut(), (arg0,));
845-
async move {
846-
let (ret0,) = future.await?;
847-
Ok(ret0)
848-
}
837+
wasmtime::component::__internal::FutureExt::map(
838+
callee.call_concurrent(store.as_context_mut(), (arg0,)),
839+
|v| v.map(|(v,)| v),
840+
)
849841
}
850842
pub fn call_roundtrip_flag16<S: wasmtime::AsContextMut>(
851843
&self,
@@ -863,12 +855,10 @@ pub mod exports {
863855
(Flag16,),
864856
>::new_unchecked(self.roundtrip_flag16)
865857
};
866-
let future = callee
867-
.call_concurrent(store.as_context_mut(), (arg0,));
868-
async move {
869-
let (ret0,) = future.await?;
870-
Ok(ret0)
871-
}
858+
wasmtime::component::__internal::FutureExt::map(
859+
callee.call_concurrent(store.as_context_mut(), (arg0,)),
860+
|v| v.map(|(v,)| v),
861+
)
872862
}
873863
pub fn call_roundtrip_flag32<S: wasmtime::AsContextMut>(
874864
&self,
@@ -886,12 +876,10 @@ pub mod exports {
886876
(Flag32,),
887877
>::new_unchecked(self.roundtrip_flag32)
888878
};
889-
let future = callee
890-
.call_concurrent(store.as_context_mut(), (arg0,));
891-
async move {
892-
let (ret0,) = future.await?;
893-
Ok(ret0)
894-
}
879+
wasmtime::component::__internal::FutureExt::map(
880+
callee.call_concurrent(store.as_context_mut(), (arg0,)),
881+
|v| v.map(|(v,)| v),
882+
)
895883
}
896884
pub fn call_roundtrip_flag64<S: wasmtime::AsContextMut>(
897885
&self,
@@ -909,12 +897,10 @@ pub mod exports {
909897
(Flag64,),
910898
>::new_unchecked(self.roundtrip_flag64)
911899
};
912-
let future = callee
913-
.call_concurrent(store.as_context_mut(), (arg0,));
914-
async move {
915-
let (ret0,) = future.await?;
916-
Ok(ret0)
917-
}
900+
wasmtime::component::__internal::FutureExt::map(
901+
callee.call_concurrent(store.as_context_mut(), (arg0,)),
902+
|v| v.map(|(v,)| v),
903+
)
918904
}
919905
}
920906
}

‎crates/component-macro/tests/expanded/floats_concurrent.rs‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -409,11 +409,10 @@ pub mod exports {
409409
(f32,),
410410
>::new_unchecked(self.f32_result)
411411
};
412-
let future = callee.call_concurrent(store.as_context_mut(), ());
413-
async move {
414-
let (ret0,) = future.await?;
415-
Ok(ret0)
416-
}
412+
wasmtime::component::__internal::FutureExt::map(
413+
callee.call_concurrent(store.as_context_mut(), ()),
414+
|v| v.map(|(v,)| v),
415+
)
417416
}
418417
pub fn call_f64_result<S: wasmtime::AsContextMut>(
419418
&self,
@@ -430,11 +429,10 @@ pub mod exports {
430429
(f64,),
431430
>::new_unchecked(self.f64_result)
432431
};
433-
let future = callee.call_concurrent(store.as_context_mut(), ());
434-
async move {
435-
let (ret0,) = future.await?;
436-
Ok(ret0)
437-
}
432+
wasmtime::component::__internal::FutureExt::map(
433+
callee.call_concurrent(store.as_context_mut(), ()),
434+
|v| v.map(|(v,)| v),
435+
)
438436
}
439437
}
440438
}

‎crates/component-macro/tests/expanded/integers_concurrent.rs‎

Lines changed: 36 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -921,11 +921,10 @@ pub mod exports {
921921
(u8,),
922922
>::new_unchecked(self.r1)
923923
};
924-
let future = callee.call_concurrent(store.as_context_mut(), ());
925-
async move {
926-
let (ret0,) = future.await?;
927-
Ok(ret0)
928-
}
924+
wasmtime::component::__internal::FutureExt::map(
925+
callee.call_concurrent(store.as_context_mut(), ()),
926+
|v| v.map(|(v,)| v),
927+
)
929928
}
930929
pub fn call_r2<S: wasmtime::AsContextMut>(
931930
&self,
@@ -942,11 +941,10 @@ pub mod exports {
942941
(i8,),
943942
>::new_unchecked(self.r2)
944943
};
945-
let future = callee.call_concurrent(store.as_context_mut(), ());
946-
async move {
947-
let (ret0,) = future.await?;
948-
Ok(ret0)
949-
}
944+
wasmtime::component::__internal::FutureExt::map(
945+
callee.call_concurrent(store.as_context_mut(), ()),
946+
|v| v.map(|(v,)| v),
947+
)
950948
}
951949
pub fn call_r3<S: wasmtime::AsContextMut>(
952950
&self,
@@ -963,11 +961,10 @@ pub mod exports {
963961
(u16,),
964962
>::new_unchecked(self.r3)
965963
};
966-
let future = callee.call_concurrent(store.as_context_mut(), ());
967-
async move {
968-
let (ret0,) = future.await?;
969-
Ok(ret0)
970-
}
964+
wasmtime::component::__internal::FutureExt::map(
965+
callee.call_concurrent(store.as_context_mut(), ()),
966+
|v| v.map(|(v,)| v),
967+
)
971968
}
972969
pub fn call_r4<S: wasmtime::AsContextMut>(
973970
&self,
@@ -984,11 +981,10 @@ pub mod exports {
984981
(i16,),
985982
>::new_unchecked(self.r4)
986983
};
987-
let future = callee.call_concurrent(store.as_context_mut(), ());
988-
async move {
989-
let (ret0,) = future.await?;
990-
Ok(ret0)
991-
}
984+
wasmtime::component::__internal::FutureExt::map(
985+
callee.call_concurrent(store.as_context_mut(), ()),
986+
|v| v.map(|(v,)| v),
987+
)
992988
}
993989
pub fn call_r5<S: wasmtime::AsContextMut>(
994990
&self,
@@ -1005,11 +1001,10 @@ pub mod exports {
10051001
(u32,),
10061002
>::new_unchecked(self.r5)
10071003
};
1008-
let future = callee.call_concurrent(store.as_context_mut(), ());
1009-
async move {
1010-
let (ret0,) = future.await?;
1011-
Ok(ret0)
1012-
}
1004+
wasmtime::component::__internal::FutureExt::map(
1005+
callee.call_concurrent(store.as_context_mut(), ()),
1006+
|v| v.map(|(v,)| v),
1007+
)
10131008
}
10141009
pub fn call_r6<S: wasmtime::AsContextMut>(
10151010
&self,
@@ -1026,11 +1021,10 @@ pub mod exports {
10261021
(i32,),
10271022
>::new_unchecked(self.r6)
10281023
};
1029-
let future = callee.call_concurrent(store.as_context_mut(), ());
1030-
async move {
1031-
let (ret0,) = future.await?;
1032-
Ok(ret0)
1033-
}
1024+
wasmtime::component::__internal::FutureExt::map(
1025+
callee.call_concurrent(store.as_context_mut(), ()),
1026+
|v| v.map(|(v,)| v),
1027+
)
10341028
}
10351029
pub fn call_r7<S: wasmtime::AsContextMut>(
10361030
&self,
@@ -1047,11 +1041,10 @@ pub mod exports {
10471041
(u64,),
10481042
>::new_unchecked(self.r7)
10491043
};
1050-
let future = callee.call_concurrent(store.as_context_mut(), ());
1051-
async move {
1052-
let (ret0,) = future.await?;
1053-
Ok(ret0)
1054-
}
1044+
wasmtime::component::__internal::FutureExt::map(
1045+
callee.call_concurrent(store.as_context_mut(), ()),
1046+
|v| v.map(|(v,)| v),
1047+
)
10551048
}
10561049
pub fn call_r8<S: wasmtime::AsContextMut>(
10571050
&self,
@@ -1068,11 +1061,10 @@ pub mod exports {
10681061
(i64,),
10691062
>::new_unchecked(self.r8)
10701063
};
1071-
let future = callee.call_concurrent(store.as_context_mut(), ());
1072-
async move {
1073-
let (ret0,) = future.await?;
1074-
Ok(ret0)
1075-
}
1064+
wasmtime::component::__internal::FutureExt::map(
1065+
callee.call_concurrent(store.as_context_mut(), ()),
1066+
|v| v.map(|(v,)| v),
1067+
)
10761068
}
10771069
pub fn call_pair_ret<S: wasmtime::AsContextMut>(
10781070
&self,
@@ -1089,11 +1081,10 @@ pub mod exports {
10891081
((i64, u8),),
10901082
>::new_unchecked(self.pair_ret)
10911083
};
1092-
let future = callee.call_concurrent(store.as_context_mut(), ());
1093-
async move {
1094-
let (ret0,) = future.await?;
1095-
Ok(ret0)
1096-
}
1084+
wasmtime::component::__internal::FutureExt::map(
1085+
callee.call_concurrent(store.as_context_mut(), ()),
1086+
|v| v.map(|(v,)| v),
1087+
)
10971088
}
10981089
}
10991090
}

0 commit comments

Comments
 (0)