Merge branch 'master' into wasi-support-test

yewstack · Mar 19, 2024 · c861fa5 · c861fa5
2 parents 6336f52 + e9739fc
commit c861fa5
Show file tree

Hide file tree

Showing 17 changed files with 307 additions and 126 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/yew-macro/src/hook/mod.rs b/packages/yew-macro/src/hook/mod.rs
@@ -144,11 +144,13 @@ pub fn hook_impl(hook: HookFn) -> syn::Result<TokenStream> {
 
         let as_boxed_fn = with_output.then(|| quote! { as #boxed_fn_type });
 
+        let generic_types = generics.type_params().map(|t| &t.ident);
+
         // We need boxing implementation for `impl Trait` arguments.
         quote! {
             let #boxed_inner_ident = ::std::boxed::Box::new(
                     move |#ctx_ident: &mut ::yew::functional::HookContext| #inner_fn_rt {
-                        #inner_fn_ident (#ctx_ident, #(#input_args,)*)
+                        #inner_fn_ident :: <#(#generic_types,)*> (#ctx_ident, #(#input_args,)*)
                     }
                 ) #as_boxed_fn;
 

diff --git a/packages/yew-macro/tests/classes_macro/classes-fail.stderr b/packages/yew-macro/tests/classes_macro/classes-fail.stderr
@@ -21,7 +21,7 @@ error[E0277]: the trait bound `Classes: From<{integer}>` is not satisfied
             <Classes as From<&Option<T>>>
             <Classes as From<&String>>
             <Classes as From<&[T]>>
-            <Classes as From<&implicit_clone::unsync::IString>>
+            <Classes as From<&implicit_clone::unsync::string::IString>>
             <Classes as From<Cow<'static, str>>>
             <Classes as From<Option<T>>>
             <Classes as From<String>>
@@ -44,7 +44,7 @@ error[E0277]: the trait bound `Classes: From<{float}>` is not satisfied
             <Classes as From<&Option<T>>>
             <Classes as From<&String>>
             <Classes as From<&[T]>>
-            <Classes as From<&implicit_clone::unsync::IString>>
+            <Classes as From<&implicit_clone::unsync::string::IString>>
             <Classes as From<Cow<'static, str>>>
             <Classes as From<Option<T>>>
             <Classes as From<String>>
@@ -67,7 +67,7 @@ error[E0277]: the trait bound `Classes: From<{integer}>` is not satisfied
             <Classes as From<&Option<T>>>
             <Classes as From<&String>>
             <Classes as From<&[T]>>
-            <Classes as From<&implicit_clone::unsync::IString>>
+            <Classes as From<&implicit_clone::unsync::string::IString>>
             <Classes as From<Cow<'static, str>>>
             <Classes as From<Option<T>>>
             <Classes as From<String>>
@@ -93,7 +93,7 @@ error[E0277]: the trait bound `Classes: From<{integer}>` is not satisfied
              <Classes as From<&Option<T>>>
              <Classes as From<&String>>
              <Classes as From<&[T]>>
-             <Classes as From<&implicit_clone::unsync::IString>>
+             <Classes as From<&implicit_clone::unsync::string::IString>>
              <Classes as From<Cow<'static, str>>>
              <Classes as From<Option<T>>>
              <Classes as From<String>>
@@ -119,7 +119,7 @@ error[E0277]: the trait bound `Classes: From<u32>` is not satisfied
              <Classes as From<&Option<T>>>
              <Classes as From<&String>>
              <Classes as From<&[T]>>
-             <Classes as From<&implicit_clone::unsync::IString>>
+             <Classes as From<&implicit_clone::unsync::string::IString>>
              <Classes as From<Cow<'static, str>>>
              <Classes as From<Option<T>>>
              <Classes as From<String>>
@@ -145,7 +145,7 @@ error[E0277]: the trait bound `Classes: From<{integer}>` is not satisfied
              <Classes as From<&Option<T>>>
              <Classes as From<&String>>
              <Classes as From<&[T]>>
-             <Classes as From<&implicit_clone::unsync::IString>>
+             <Classes as From<&implicit_clone::unsync::string::IString>>
              <Classes as From<Cow<'static, str>>>
              <Classes as From<Option<T>>>
              <Classes as From<String>>

diff --git a/packages/yew-macro/tests/hook_attr/hook-trait-item-pass.rs b/packages/yew-macro/tests/hook_attr/hook-trait-item-pass.rs
@@ -0,0 +1,22 @@
+use std::marker::PhantomData;
+
+pub struct QueryState<T> {
+    p: PhantomData<T>
+}
+
+pub trait MyTrait {
+    type Associated;
+}
+
+
+#[yew::hook]
+pub fn use_query_state<Props>(
+    selector: impl yew::html::IntoPropValue<bool>,
+) -> QueryState<Props::Associated>
+where
+    Props: MyTrait,
+{
+    QueryState::<Props::Associated> { p: PhantomData::<Props::Associated> }
+}
+
+fn main() {}