Introduces the FromQuery and IntoQuery traits

packages/yew-router/src/lib.rs

@@ -90,6 +90,14 @@ pub mod history {
     };
 }
 
+pub mod query {
+    //! A module that provides custom query serialization & deserialization.
+
+    pub use gloo::history::query:: {
+        ToQuery, FromQuery, Raw
+    };
+}
+
 pub mod prelude {
     //! Prelude module to be imported when working with `yew-router`.
     //!

packages/yew-router/src/navigator.rs

@@ -1,7 +1,6 @@
 use std::borrow::Cow;
 
-use serde::Serialize;
-
+use crate::query::ToQuery;
 use crate::history::{AnyHistory, History, HistoryError, HistoryResult};
 use crate::routable::Routable;
 
@@ -93,20 +92,20 @@ impl Navigator {
     }
 
     /// Same as `.push()` but affix the queries to the end of the route.
-    pub fn push_with_query<R, Q>(&self, route: &R, query: &Q) -> NavigationResult<()>
+    pub fn push_with_query<R, Q>(&self, route: &R, query: Q) -> Result<(), Q::Error>
     where
         R: Routable,
-        Q: Serialize,
+        Q: ToQuery,
     {
         self.inner
             .push_with_query(self.prefix_basename(&route.to_path()), query)
     }
 
     /// Same as `.replace()` but affix the queries to the end of the route.
-    pub fn replace_with_query<R, Q>(&self, route: &R, query: &Q) -> NavigationResult<()>
+    pub fn replace_with_query<R, Q>(&self, route: &R, query: Q) -> Result<(), Q::Error>
     where
         R: Routable,
-        Q: Serialize,
+        Q: ToQuery,
     {
         self.inner
             .replace_with_query(self.prefix_basename(&route.to_path()), query)
@@ -116,12 +115,12 @@ impl Navigator {
     pub fn push_with_query_and_state<R, Q, T>(
         &self,
         route: &R,
-        query: &Q,
+        query: Q,
         state: T,
-    ) -> NavigationResult<()>
+    ) -> Result<(), Q::Error>
     where
         R: Routable,
-        Q: Serialize,
+        Q: ToQuery,
         T: 'static,
     {
         self.inner
@@ -132,12 +131,12 @@ impl Navigator {
     pub fn replace_with_query_and_state<R, Q, T>(
         &self,
         route: &R,
-        query: &Q,
+        query: Q,
         state: T,
-    ) -> NavigationResult<()>
+    ) -> Result<(), Q::Error>
     where
         R: Routable,
-        Q: Serialize,
+        Q: ToQuery,
         T: 'static,
     {
         self.inner.replace_with_query_and_state(