Skip to content

Commit f063003

Browse files
pchickeypchickey
authored
wasmtime-wit-bindgen: use core instead of std in all emitted code (#10105)
* wasmtime-wit-bindgen: use core instead of std in all emitted code prtest:full * wasmtime-component-macro: BINDGEN_TEST_BLESS for changes to macro. * no more use of `std` feature in wasmtime-wit-bindgen and component-macro
1 parent 43f46ec commit f063003

Some content is hidden

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

45 files changed

+738
-747
lines changed

‎crates/component-macro/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,4 @@ similar = { workspace = true }
4141

4242
[features]
4343
async = []
44-
std = ['wasmtime-wit-bindgen/std']
45-
component-model-async = ['std', 'async', 'wasmtime-wit-bindgen/component-model-async']
44+
component-model-async = ['async', 'wasmtime-wit-bindgen/component-model-async']

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ pub mod foo {
199199
fn take_char(
200200
store: wasmtime::StoreContextMut<'_, Self::Data>,
201201
x: char,
202-
) -> impl ::std::future::Future<
202+
) -> impl ::core::future::Future<
203203
Output = impl FnOnce(
204204
wasmtime::StoreContextMut<'_, Self::Data>,
205205
) -> () + Send + Sync + 'static,
@@ -209,7 +209,7 @@ pub mod foo {
209209
/// A function that returns a character
210210
fn return_char(
211211
store: wasmtime::StoreContextMut<'_, Self::Data>,
212-
) -> impl ::std::future::Future<
212+
) -> impl ::core::future::Future<
213213
Output = impl FnOnce(
214214
wasmtime::StoreContextMut<'_, Self::Data>,
215215
) -> char + Send + Sync + 'static,
@@ -261,9 +261,9 @@ pub mod foo {
261261
) -> wasmtime::Result<()> + Send + Sync,
262262
>
263263
})
264-
as ::std::pin::Pin<
264+
as ::core::pin::Pin<
265265
Box<
266-
dyn ::std::future::Future<
266+
dyn ::core::future::Future<
267267
Output = Box<
268268
dyn FnOnce(
269269
wasmtime::StoreContextMut<'_, T>,
@@ -291,9 +291,9 @@ pub mod foo {
291291
) -> wasmtime::Result<(char,)> + Send + Sync,
292292
>
293293
})
294-
as ::std::pin::Pin<
294+
as ::core::pin::Pin<
295295
Box<
296-
dyn ::std::future::Future<
296+
dyn ::core::future::Future<
297297
Output = Box<
298298
dyn FnOnce(
299299
wasmtime::StoreContextMut<'_, T>,
@@ -322,7 +322,7 @@ pub mod foo {
322322
fn take_char(
323323
store: wasmtime::StoreContextMut<'_, Self::Data>,
324324
x: char,
325-
) -> impl ::std::future::Future<
325+
) -> impl ::core::future::Future<
326326
Output = impl FnOnce(
327327
wasmtime::StoreContextMut<'_, Self::Data>,
328328
) -> () + Send + Sync + 'static,
@@ -335,7 +335,7 @@ pub mod foo {
335335
/// A function that returns a character
336336
fn return_char(
337337
store: wasmtime::StoreContextMut<'_, Self::Data>,
338-
) -> impl ::std::future::Future<
338+
) -> impl ::core::future::Future<
339339
Output = impl FnOnce(
340340
wasmtime::StoreContextMut<'_, Self::Data>,
341341
) -> char + Send + Sync + 'static,

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

Lines changed: 48 additions & 48 deletions
Large diffs are not rendered by default.

‎crates/component-macro/tests/expanded/dead-code_concurrent.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ pub mod a {
207207
type Data;
208208
fn f(
209209
store: wasmtime::StoreContextMut<'_, Self::Data>,
210-
) -> impl ::std::future::Future<
210+
) -> impl ::core::future::Future<
211211
Output = impl FnOnce(
212212
wasmtime::StoreContextMut<'_, Self::Data>,
213213
) -> LiveType + Send + Sync + 'static,
@@ -256,9 +256,9 @@ pub mod a {
256256
) -> wasmtime::Result<(LiveType,)> + Send + Sync,
257257
>
258258
})
259-
as ::std::pin::Pin<
259+
as ::core::pin::Pin<
260260
Box<
261-
dyn ::std::future::Future<
261+
dyn ::core::future::Future<
262262
Output = Box<
263263
dyn FnOnce(
264264
wasmtime::StoreContextMut<'_, T>,
@@ -285,7 +285,7 @@ pub mod a {
285285
type Data = _T::Data;
286286
fn f(
287287
store: wasmtime::StoreContextMut<'_, Self::Data>,
288-
) -> impl ::std::future::Future<
288+
) -> impl ::core::future::Future<
289289
Output = impl FnOnce(
290290
wasmtime::StoreContextMut<'_, Self::Data>,
291291
) -> LiveType + Send + Sync + 'static,

‎crates/component-macro/tests/expanded/direct-import_concurrent.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ pub trait FooImports {
9999
type Data;
100100
fn foo(
101101
store: wasmtime::StoreContextMut<'_, Self::Data>,
102-
) -> impl ::std::future::Future<
102+
) -> impl ::core::future::Future<
103103
Output = impl FnOnce(
104104
wasmtime::StoreContextMut<'_, Self::Data>,
105105
) -> () + Send + Sync + 'static,
@@ -124,7 +124,7 @@ impl<_T: FooImports> FooImports for &mut _T {
124124
type Data = _T::Data;
125125
fn foo(
126126
store: wasmtime::StoreContextMut<'_, Self::Data>,
127-
) -> impl ::std::future::Future<
127+
) -> impl ::core::future::Future<
128128
Output = impl FnOnce(
129129
wasmtime::StoreContextMut<'_, Self::Data>,
130130
) -> () + Send + Sync + 'static,
@@ -230,9 +230,9 @@ const _: () = {
230230
) -> wasmtime::Result<()> + Send + Sync,
231231
>
232232
})
233-
as ::std::pin::Pin<
233+
as ::core::pin::Pin<
234234
Box<
235-
dyn ::std::future::Future<
235+
dyn ::core::future::Future<
236236
Output = Box<
237237
dyn FnOnce(
238238
wasmtime::StoreContextMut<'_, T>,

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ pub mod foo {
312312
fn roundtrip_flag1(
313313
store: wasmtime::StoreContextMut<'_, Self::Data>,
314314
x: Flag1,
315-
) -> impl ::std::future::Future<
315+
) -> impl ::core::future::Future<
316316
Output = impl FnOnce(
317317
wasmtime::StoreContextMut<'_, Self::Data>,
318318
) -> Flag1 + Send + Sync + 'static,
@@ -322,7 +322,7 @@ pub mod foo {
322322
fn roundtrip_flag2(
323323
store: wasmtime::StoreContextMut<'_, Self::Data>,
324324
x: Flag2,
325-
) -> impl ::std::future::Future<
325+
) -> impl ::core::future::Future<
326326
Output = impl FnOnce(
327327
wasmtime::StoreContextMut<'_, Self::Data>,
328328
) -> Flag2 + Send + Sync + 'static,
@@ -332,7 +332,7 @@ pub mod foo {
332332
fn roundtrip_flag4(
333333
store: wasmtime::StoreContextMut<'_, Self::Data>,
334334
x: Flag4,
335-
) -> impl ::std::future::Future<
335+
) -> impl ::core::future::Future<
336336
Output = impl FnOnce(
337337
wasmtime::StoreContextMut<'_, Self::Data>,
338338
) -> Flag4 + Send + Sync + 'static,
@@ -342,7 +342,7 @@ pub mod foo {
342342
fn roundtrip_flag8(
343343
store: wasmtime::StoreContextMut<'_, Self::Data>,
344344
x: Flag8,
345-
) -> impl ::std::future::Future<
345+
) -> impl ::core::future::Future<
346346
Output = impl FnOnce(
347347
wasmtime::StoreContextMut<'_, Self::Data>,
348348
) -> Flag8 + Send + Sync + 'static,
@@ -352,7 +352,7 @@ pub mod foo {
352352
fn roundtrip_flag16(
353353
store: wasmtime::StoreContextMut<'_, Self::Data>,
354354
x: Flag16,
355-
) -> impl ::std::future::Future<
355+
) -> impl ::core::future::Future<
356356
Output = impl FnOnce(
357357
wasmtime::StoreContextMut<'_, Self::Data>,
358358
) -> Flag16 + Send + Sync + 'static,
@@ -362,7 +362,7 @@ pub mod foo {
362362
fn roundtrip_flag32(
363363
store: wasmtime::StoreContextMut<'_, Self::Data>,
364364
x: Flag32,
365-
) -> impl ::std::future::Future<
365+
) -> impl ::core::future::Future<
366366
Output = impl FnOnce(
367367
wasmtime::StoreContextMut<'_, Self::Data>,
368368
) -> Flag32 + Send + Sync + 'static,
@@ -372,7 +372,7 @@ pub mod foo {
372372
fn roundtrip_flag64(
373373
store: wasmtime::StoreContextMut<'_, Self::Data>,
374374
x: Flag64,
375-
) -> impl ::std::future::Future<
375+
) -> impl ::core::future::Future<
376376
Output = impl FnOnce(
377377
wasmtime::StoreContextMut<'_, Self::Data>,
378378
) -> Flag64 + Send + Sync + 'static,
@@ -424,9 +424,9 @@ pub mod foo {
424424
) -> wasmtime::Result<(Flag1,)> + Send + Sync,
425425
>
426426
})
427-
as ::std::pin::Pin<
427+
as ::core::pin::Pin<
428428
Box<
429-
dyn ::std::future::Future<
429+
dyn ::core::future::Future<
430430
Output = Box<
431431
dyn FnOnce(
432432
wasmtime::StoreContextMut<'_, T>,
@@ -457,9 +457,9 @@ pub mod foo {
457457
) -> wasmtime::Result<(Flag2,)> + Send + Sync,
458458
>
459459
})
460-
as ::std::pin::Pin<
460+
as ::core::pin::Pin<
461461
Box<
462-
dyn ::std::future::Future<
462+
dyn ::core::future::Future<
463463
Output = Box<
464464
dyn FnOnce(
465465
wasmtime::StoreContextMut<'_, T>,
@@ -490,9 +490,9 @@ pub mod foo {
490490
) -> wasmtime::Result<(Flag4,)> + Send + Sync,
491491
>
492492
})
493-
as ::std::pin::Pin<
493+
as ::core::pin::Pin<
494494
Box<
495-
dyn ::std::future::Future<
495+
dyn ::core::future::Future<
496496
Output = Box<
497497
dyn FnOnce(
498498
wasmtime::StoreContextMut<'_, T>,
@@ -523,9 +523,9 @@ pub mod foo {
523523
) -> wasmtime::Result<(Flag8,)> + Send + Sync,
524524
>
525525
})
526-
as ::std::pin::Pin<
526+
as ::core::pin::Pin<
527527
Box<
528-
dyn ::std::future::Future<
528+
dyn ::core::future::Future<
529529
Output = Box<
530530
dyn FnOnce(
531531
wasmtime::StoreContextMut<'_, T>,
@@ -556,9 +556,9 @@ pub mod foo {
556556
) -> wasmtime::Result<(Flag16,)> + Send + Sync,
557557
>
558558
})
559-
as ::std::pin::Pin<
559+
as ::core::pin::Pin<
560560
Box<
561-
dyn ::std::future::Future<
561+
dyn ::core::future::Future<
562562
Output = Box<
563563
dyn FnOnce(
564564
wasmtime::StoreContextMut<'_, T>,
@@ -589,9 +589,9 @@ pub mod foo {
589589
) -> wasmtime::Result<(Flag32,)> + Send + Sync,
590590
>
591591
})
592-
as ::std::pin::Pin<
592+
as ::core::pin::Pin<
593593
Box<
594-
dyn ::std::future::Future<
594+
dyn ::core::future::Future<
595595
Output = Box<
596596
dyn FnOnce(
597597
wasmtime::StoreContextMut<'_, T>,
@@ -622,9 +622,9 @@ pub mod foo {
622622
) -> wasmtime::Result<(Flag64,)> + Send + Sync,
623623
>
624624
})
625-
as ::std::pin::Pin<
625+
as ::core::pin::Pin<
626626
Box<
627-
dyn ::std::future::Future<
627+
dyn ::core::future::Future<
628628
Output = Box<
629629
dyn FnOnce(
630630
wasmtime::StoreContextMut<'_, T>,
@@ -652,7 +652,7 @@ pub mod foo {
652652
fn roundtrip_flag1(
653653
store: wasmtime::StoreContextMut<'_, Self::Data>,
654654
x: Flag1,
655-
) -> impl ::std::future::Future<
655+
) -> impl ::core::future::Future<
656656
Output = impl FnOnce(
657657
wasmtime::StoreContextMut<'_, Self::Data>,
658658
) -> Flag1 + Send + Sync + 'static,
@@ -665,7 +665,7 @@ pub mod foo {
665665
fn roundtrip_flag2(
666666
store: wasmtime::StoreContextMut<'_, Self::Data>,
667667
x: Flag2,
668-
) -> impl ::std::future::Future<
668+
) -> impl ::core::future::Future<
669669
Output = impl FnOnce(
670670
wasmtime::StoreContextMut<'_, Self::Data>,
671671
) -> Flag2 + Send + Sync + 'static,
@@ -678,7 +678,7 @@ pub mod foo {
678678
fn roundtrip_flag4(
679679
store: wasmtime::StoreContextMut<'_, Self::Data>,
680680
x: Flag4,
681-
) -> impl ::std::future::Future<
681+
) -> impl ::core::future::Future<
682682
Output = impl FnOnce(
683683
wasmtime::StoreContextMut<'_, Self::Data>,
684684
) -> Flag4 + Send + Sync + 'static,
@@ -691,7 +691,7 @@ pub mod foo {
691691
fn roundtrip_flag8(
692692
store: wasmtime::StoreContextMut<'_, Self::Data>,
693693
x: Flag8,
694-
) -> impl ::std::future::Future<
694+
) -> impl ::core::future::Future<
695695
Output = impl FnOnce(
696696
wasmtime::StoreContextMut<'_, Self::Data>,
697697
) -> Flag8 + Send + Sync + 'static,
@@ -704,7 +704,7 @@ pub mod foo {
704704
fn roundtrip_flag16(
705705
store: wasmtime::StoreContextMut<'_, Self::Data>,
706706
x: Flag16,
707-
) -> impl ::std::future::Future<
707+
) -> impl ::core::future::Future<
708708
Output = impl FnOnce(
709709
wasmtime::StoreContextMut<'_, Self::Data>,
710710
) -> Flag16 + Send + Sync + 'static,
@@ -717,7 +717,7 @@ pub mod foo {
717717
fn roundtrip_flag32(
718718
store: wasmtime::StoreContextMut<'_, Self::Data>,
719719
x: Flag32,
720-
) -> impl ::std::future::Future<
720+
) -> impl ::core::future::Future<
721721
Output = impl FnOnce(
722722
wasmtime::StoreContextMut<'_, Self::Data>,
723723
) -> Flag32 + Send + Sync + 'static,
@@ -730,7 +730,7 @@ pub mod foo {
730730
fn roundtrip_flag64(
731731
store: wasmtime::StoreContextMut<'_, Self::Data>,
732732
x: Flag64,
733-
) -> impl ::std::future::Future<
733+
) -> impl ::core::future::Future<
734734
Output = impl FnOnce(
735735
wasmtime::StoreContextMut<'_, Self::Data>,
736736
) -> Flag64 + Send + Sync + 'static,

0 commit comments

Comments
 (0)