chore: Clean up

Author: marc2332

examples/queries.rs

@@ -32,43 +32,27 @@ enum QueryValue {
 }
 
 async fn fetch_user(keys: Vec<QueryKey>) -> QueryResult<QueryValue, QueryError> {
-    if let Some(QueryKey::User(id)) = keys.first() {
-        println!("Fetching name of user {id}");
-        sleep(Duration::from_millis(650)).await;
-        match id {
-            0 => Ok(QueryValue::UserName("Marc".to_string())),
-            _ => Err(QueryError::UserNotFound(*id)),
-        }
-    } else {
-        Err(QueryError::Unknown)
+    let Some(QueryKey::User(id)) = keys.first() else {
+        return Err(QueryError::Unknown);
+    };
+    println!("Fetching name of user {id}");
+    sleep(Duration::from_millis(650)).await;
+    match id {
+        0 => Ok(QueryValue::UserName("Marc".to_string())),
+        _ => Err(QueryError::UserNotFound(*id)),
     }
 }
 
 async fn fetch_user_age(keys: Vec<QueryKey>) -> QueryResult<QueryValue, QueryError> {
-    if let Some(QueryKey::User(id)) = keys.first() {
-        println!("Fetching age of user {id}");
-        sleep(Duration::from_millis(1000)).await;
-        match id {
-            0 => Ok(QueryValue::UserAge(0)),
-            _ => Err(QueryError::UserNotFound(*id)),
-        }
-    } else {
-        Err(QueryError::Unknown)
-    }
-}
-
-#[derive(Debug)]
-enum MutationError {}
-
-#[derive(PartialEq, Debug)]
-enum MutationValue {
-    UserUpdated(usize),
-}
-
-async fn update_user((id, _name): (usize, String)) -> MutationResult<MutationValue, MutationError> {
-    println!("Mutating user");
+    let Some(QueryKey::User(id)) = keys.first() else {
+        return Err(QueryError::Unknown);
+    };
+    println!("Fetching age of user {id}");
     sleep(Duration::from_millis(1000)).await;
-    Ok(MutationValue::UserUpdated(id))
+    match id {
+        0 => Ok(QueryValue::UserAge(0)),
+        _ => Err(QueryError::UserNotFound(*id)),
+    }
 }
 
 #[allow(non_snake_case)]
@@ -86,11 +70,9 @@ fn User(id: usize) -> Element {
 }
 
 fn app() -> Element {
-    let mutate = use_mutation(update_user);
     let client = use_init_query_client::<QueryValue, QueryError, QueryKey>();
 
     let refresh = move |_| async move {
-        mutate.mutate_async((0, "Not Marc".to_string())).await;
         client.invalidate_queries(&[QueryKey::User(0)]);
     };
 

src/cached_result.rs

@@ -12,7 +12,7 @@ pub struct CachedResult<T, E> {
 }
 
 impl<T, E> CachedResult<T, E> {
-    pub fn new(value: QueryState<T, E>) -> Self {
+    pub(crate) fn new(value: QueryState<T, E>) -> Self {
         Self {
             value,
             ..Default::default()
@@ -25,7 +25,7 @@ impl<T, E> CachedResult<T, E> {
     }
 
     /// Set this result's value
-    pub fn set_value(&mut self, new_value: QueryState<T, E>) {
+    pub(crate) fn set_value(&mut self, new_value: QueryState<T, E>) {
         self.value = new_value;
         self.instant = Some(Instant::now());
     }

src/result.rs

@@ -25,7 +25,7 @@ impl<T, E> QueryState<T, E> {
         matches!(self, QueryState::Loading(..))
     }
 
-    pub fn set_loading(&mut self) {
+    pub(crate) fn set_loading(&mut self) {
         let result = mem::replace(self, Self::Loading(None)).into();
         if let Some(v) = result {
             *self = Self::Loading(Some(v))