Skip to content
This repository was archived by the owner on Sep 8, 2025. It is now read-only.

Commit 349b21b

Browse files
alexcrichtonalexcrichton
authored
Merge pull request #193 from alexcrichton/another-main-diff-smaller
Reduce diff with main in wit-bindgen
2 parents 6dd91ae + 0eb2621 commit 349b21b

137 files changed

Lines changed: 547 additions & 556 deletions

File tree

Some content is hidden

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ const _: () = {
127127
impl TheWorld {
128128
/// Convenience wrapper around [`TheWorldPre::new`] and
129129
/// [`TheWorldPre::instantiate`].
130-
pub fn instantiate<_T: 'static>(
130+
pub fn instantiate<_T>(
131131
store: impl wasmtime::AsContextMut<Data = _T>,
132132
component: &wasmtime::component::Component,
133133
linker: &wasmtime::component::Linker<_T>,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ const _: () = {
130130
impl TheWorld {
131131
/// Convenience wrapper around [`TheWorldPre::new`] and
132132
/// [`TheWorldPre::instantiate_async`].
133-
pub async fn instantiate_async<_T: 'static>(
133+
pub async fn instantiate_async<_T>(
134134
store: impl wasmtime::AsContextMut<Data = _T>,
135135
component: &wasmtime::component::Component,
136136
linker: &wasmtime::component::Linker<_T>,
@@ -311,7 +311,7 @@ pub mod exports {
311311
arg0: char,
312312
) -> wasmtime::Result<()>
313313
where
314-
<S as wasmtime::AsContext>::Data: Send + 'static,
314+
<S as wasmtime::AsContext>::Data: Send,
315315
{
316316
let callee = unsafe {
317317
wasmtime::component::TypedFunc::<
@@ -331,7 +331,7 @@ pub mod exports {
331331
mut store: S,
332332
) -> wasmtime::Result<char>
333333
where
334-
<S as wasmtime::AsContext>::Data: Send + 'static,
334+
<S as wasmtime::AsContext>::Data: Send,
335335
{
336336
let callee = unsafe {
337337
wasmtime::component::TypedFunc::<

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ const _: () = {
130130
impl TheWorld {
131131
/// Convenience wrapper around [`TheWorldPre::new`] and
132132
/// [`TheWorldPre::instantiate_async`].
133-
pub async fn instantiate_async<_T: 'static>(
133+
pub async fn instantiate_async<_T>(
134134
store: impl wasmtime::AsContextMut<Data = _T>,
135135
component: &wasmtime::component::Component,
136136
linker: &wasmtime::component::Linker<_T>,
@@ -316,7 +316,7 @@ pub mod exports {
316316
Output = wasmtime::Result<()>,
317317
> + Send + 'static + use<S>
318318
where
319-
<S as wasmtime::AsContext>::Data: Send + 'static,
319+
<S as wasmtime::AsContext>::Data: Send,
320320
{
321321
let callee = unsafe {
322322
wasmtime::component::TypedFunc::<
@@ -334,7 +334,7 @@ pub mod exports {
334334
Output = wasmtime::Result<char>,
335335
> + Send + 'static + use<S>
336336
where
337-
<S as wasmtime::AsContext>::Data: Send + 'static,
337+
<S as wasmtime::AsContext>::Data: Send,
338338
{
339339
let callee = unsafe {
340340
wasmtime::component::TypedFunc::<

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ const _: () = {
130130
impl TheWorld {
131131
/// Convenience wrapper around [`TheWorldPre::new`] and
132132
/// [`TheWorldPre::instantiate_async`].
133-
pub async fn instantiate_async<_T: 'static>(
133+
pub async fn instantiate_async<_T>(
134134
store: impl wasmtime::AsContextMut<Data = _T>,
135135
component: &wasmtime::component::Component,
136136
linker: &wasmtime::component::Linker<_T>,
@@ -340,7 +340,7 @@ pub mod exports {
340340
arg0: char,
341341
) -> wasmtime::Result<()>
342342
where
343-
<S as wasmtime::AsContext>::Data: Send + 'static,
343+
<S as wasmtime::AsContext>::Data: Send,
344344
{
345345
use tracing::Instrument;
346346
let span = tracing::span!(
@@ -369,7 +369,7 @@ pub mod exports {
369369
mut store: S,
370370
) -> wasmtime::Result<char>
371371
where
372-
<S as wasmtime::AsContext>::Data: Send + 'static,
372+
<S as wasmtime::AsContext>::Data: Send,
373373
{
374374
use tracing::Instrument;
375375
let span = tracing::span!(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ const _: () = {
129129
impl TheWorld {
130130
/// Convenience wrapper around [`TheWorldPre::new`] and
131131
/// [`TheWorldPre::instantiate`].
132-
pub fn instantiate<_T: 'static>(
132+
pub fn instantiate<_T>(
133133
store: impl wasmtime::AsContextMut<Data = _T>,
134134
component: &wasmtime::component::Component,
135135
linker: &wasmtime::component::Linker<_T>,

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ const _: () = {
132132
impl TheWorld {
133133
/// Convenience wrapper around [`TheWorldPre::new`] and
134134
/// [`TheWorldPre::instantiate_async`].
135-
pub async fn instantiate_async<_T: 'static>(
135+
pub async fn instantiate_async<_T>(
136136
store: impl wasmtime::AsContextMut<Data = _T>,
137137
component: &wasmtime::component::Component,
138138
linker: &wasmtime::component::Linker<_T>,
@@ -623,7 +623,7 @@ pub mod exports {
623623
mut store: S,
624624
) -> wasmtime::Result<()>
625625
where
626-
<S as wasmtime::AsContext>::Data: Send + 'static,
626+
<S as wasmtime::AsContext>::Data: Send,
627627
{
628628
let callee = unsafe {
629629
wasmtime::component::TypedFunc::<
@@ -641,7 +641,7 @@ pub mod exports {
641641
arg0: LudicrousSpeed,
642642
) -> wasmtime::Result<()>
643643
where
644-
<S as wasmtime::AsContext>::Data: Send + 'static,
644+
<S as wasmtime::AsContext>::Data: Send,
645645
{
646646
let callee = unsafe {
647647
wasmtime::component::TypedFunc::<
@@ -660,7 +660,7 @@ pub mod exports {
660660
mut store: S,
661661
) -> wasmtime::Result<()>
662662
where
663-
<S as wasmtime::AsContext>::Data: Send + 'static,
663+
<S as wasmtime::AsContext>::Data: Send,
664664
{
665665
let callee = unsafe {
666666
wasmtime::component::TypedFunc::<
@@ -676,7 +676,7 @@ pub mod exports {
676676
S: wasmtime::AsContextMut,
677677
>(&self, mut store: S) -> wasmtime::Result<()>
678678
where
679-
<S as wasmtime::AsContext>::Data: Send + 'static,
679+
<S as wasmtime::AsContext>::Data: Send,
680680
{
681681
let callee = unsafe {
682682
wasmtime::component::TypedFunc::<
@@ -693,7 +693,7 @@ pub mod exports {
693693
mut store: S,
694694
) -> wasmtime::Result<()>
695695
where
696-
<S as wasmtime::AsContext>::Data: Send + 'static,
696+
<S as wasmtime::AsContext>::Data: Send,
697697
{
698698
let callee = unsafe {
699699
wasmtime::component::TypedFunc::<
@@ -710,7 +710,7 @@ pub mod exports {
710710
mut store: S,
711711
) -> wasmtime::Result<()>
712712
where
713-
<S as wasmtime::AsContext>::Data: Send + 'static,
713+
<S as wasmtime::AsContext>::Data: Send,
714714
{
715715
let callee = unsafe {
716716
wasmtime::component::TypedFunc::<
@@ -727,7 +727,7 @@ pub mod exports {
727727
mut store: S,
728728
) -> wasmtime::Result<()>
729729
where
730-
<S as wasmtime::AsContext>::Data: Send + 'static,
730+
<S as wasmtime::AsContext>::Data: Send,
731731
{
732732
let callee = unsafe {
733733
wasmtime::component::TypedFunc::<
@@ -744,7 +744,7 @@ pub mod exports {
744744
mut store: S,
745745
) -> wasmtime::Result<()>
746746
where
747-
<S as wasmtime::AsContext>::Data: Send + 'static,
747+
<S as wasmtime::AsContext>::Data: Send,
748748
{
749749
let callee = unsafe {
750750
wasmtime::component::TypedFunc::<
@@ -766,7 +766,7 @@ pub mod exports {
766766
mut store: S,
767767
) -> wasmtime::Result<()>
768768
where
769-
<S as wasmtime::AsContext>::Data: Send + 'static,
769+
<S as wasmtime::AsContext>::Data: Send,
770770
{
771771
let callee = unsafe {
772772
wasmtime::component::TypedFunc::<
@@ -783,7 +783,7 @@ pub mod exports {
783783
mut store: S,
784784
) -> wasmtime::Result<()>
785785
where
786-
<S as wasmtime::AsContext>::Data: Send + 'static,
786+
<S as wasmtime::AsContext>::Data: Send,
787787
{
788788
let callee = unsafe {
789789
wasmtime::component::TypedFunc::<
@@ -800,7 +800,7 @@ pub mod exports {
800800
mut store: S,
801801
) -> wasmtime::Result<()>
802802
where
803-
<S as wasmtime::AsContext>::Data: Send + 'static,
803+
<S as wasmtime::AsContext>::Data: Send,
804804
{
805805
let callee = unsafe {
806806
wasmtime::component::TypedFunc::<
@@ -818,7 +818,7 @@ pub mod exports {
818818
mut store: S,
819819
) -> wasmtime::Result<()>
820820
where
821-
<S as wasmtime::AsContext>::Data: Send + 'static,
821+
<S as wasmtime::AsContext>::Data: Send,
822822
{
823823
let callee = unsafe {
824824
wasmtime::component::TypedFunc::<

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ const _: () = {
132132
impl TheWorld {
133133
/// Convenience wrapper around [`TheWorldPre::new`] and
134134
/// [`TheWorldPre::instantiate_async`].
135-
pub async fn instantiate_async<_T: 'static>(
135+
pub async fn instantiate_async<_T>(
136136
store: impl wasmtime::AsContextMut<Data = _T>,
137137
component: &wasmtime::component::Component,
138138
linker: &wasmtime::component::Linker<_T>,
@@ -639,7 +639,7 @@ pub mod exports {
639639
Output = wasmtime::Result<()>,
640640
> + Send + 'static + use<S>
641641
where
642-
<S as wasmtime::AsContext>::Data: Send + 'static,
642+
<S as wasmtime::AsContext>::Data: Send,
643643
{
644644
let callee = unsafe {
645645
wasmtime::component::TypedFunc::<
@@ -657,7 +657,7 @@ pub mod exports {
657657
Output = wasmtime::Result<()>,
658658
> + Send + 'static + use<S>
659659
where
660-
<S as wasmtime::AsContext>::Data: Send + 'static,
660+
<S as wasmtime::AsContext>::Data: Send,
661661
{
662662
let callee = unsafe {
663663
wasmtime::component::TypedFunc::<
@@ -674,7 +674,7 @@ pub mod exports {
674674
Output = wasmtime::Result<()>,
675675
> + Send + 'static + use<S>
676676
where
677-
<S as wasmtime::AsContext>::Data: Send + 'static,
677+
<S as wasmtime::AsContext>::Data: Send,
678678
{
679679
let callee = unsafe {
680680
wasmtime::component::TypedFunc::<
@@ -693,7 +693,7 @@ pub mod exports {
693693
Output = wasmtime::Result<()>,
694694
> + Send + 'static + use<S>
695695
where
696-
<S as wasmtime::AsContext>::Data: Send + 'static,
696+
<S as wasmtime::AsContext>::Data: Send,
697697
{
698698
let callee = unsafe {
699699
wasmtime::component::TypedFunc::<
@@ -710,7 +710,7 @@ pub mod exports {
710710
Output = wasmtime::Result<()>,
711711
> + Send + 'static + use<S>
712712
where
713-
<S as wasmtime::AsContext>::Data: Send + 'static,
713+
<S as wasmtime::AsContext>::Data: Send,
714714
{
715715
let callee = unsafe {
716716
wasmtime::component::TypedFunc::<
@@ -727,7 +727,7 @@ pub mod exports {
727727
Output = wasmtime::Result<()>,
728728
> + Send + 'static + use<S>
729729
where
730-
<S as wasmtime::AsContext>::Data: Send + 'static,
730+
<S as wasmtime::AsContext>::Data: Send,
731731
{
732732
let callee = unsafe {
733733
wasmtime::component::TypedFunc::<
@@ -744,7 +744,7 @@ pub mod exports {
744744
Output = wasmtime::Result<()>,
745745
> + Send + 'static + use<S>
746746
where
747-
<S as wasmtime::AsContext>::Data: Send + 'static,
747+
<S as wasmtime::AsContext>::Data: Send,
748748
{
749749
let callee = unsafe {
750750
wasmtime::component::TypedFunc::<
@@ -761,7 +761,7 @@ pub mod exports {
761761
Output = wasmtime::Result<()>,
762762
> + Send + 'static + use<S>
763763
where
764-
<S as wasmtime::AsContext>::Data: Send + 'static,
764+
<S as wasmtime::AsContext>::Data: Send,
765765
{
766766
let callee = unsafe {
767767
wasmtime::component::TypedFunc::<
@@ -783,7 +783,7 @@ pub mod exports {
783783
Output = wasmtime::Result<()>,
784784
> + Send + 'static + use<S>
785785
where
786-
<S as wasmtime::AsContext>::Data: Send + 'static,
786+
<S as wasmtime::AsContext>::Data: Send,
787787
{
788788
let callee = unsafe {
789789
wasmtime::component::TypedFunc::<
@@ -800,7 +800,7 @@ pub mod exports {
800800
Output = wasmtime::Result<()>,
801801
> + Send + 'static + use<S>
802802
where
803-
<S as wasmtime::AsContext>::Data: Send + 'static,
803+
<S as wasmtime::AsContext>::Data: Send,
804804
{
805805
let callee = unsafe {
806806
wasmtime::component::TypedFunc::<
@@ -817,7 +817,7 @@ pub mod exports {
817817
Output = wasmtime::Result<()>,
818818
> + Send + 'static + use<S>
819819
where
820-
<S as wasmtime::AsContext>::Data: Send + 'static,
820+
<S as wasmtime::AsContext>::Data: Send,
821821
{
822822
let callee = unsafe {
823823
wasmtime::component::TypedFunc::<
@@ -835,7 +835,7 @@ pub mod exports {
835835
Output = wasmtime::Result<()>,
836836
> + Send + 'static + use<S>
837837
where
838-
<S as wasmtime::AsContext>::Data: Send + 'static,
838+
<S as wasmtime::AsContext>::Data: Send,
839839
{
840840
let callee = unsafe {
841841
wasmtime::component::TypedFunc::<

0 commit comments

Comments
 (0)