cargo fmt

dyesub-tool/src/components/keyboardfromfile.rs

@@ -1,8 +1,10 @@
-use leptos::{*, html::Input};
+use leptos::{html::Input, *};
 use web_sys::File;
 
-use crate::{components::ResultMessageData, utils::read_file, error::ReadKleError, models::Colorway};
 use super::ResultMessage;
+use crate::{
+    components::ResultMessageData, error::ReadKleError, models::Colorway, utils::read_file,
+};
 
 #[component]
 pub fn KeyboardFromFile(

dyesub-tool/src/components/keyboardfromweb.rs

@@ -1,8 +1,8 @@
-use leptos::{*, html::Input};
+use leptos::{html::Input, *};
 use web_sys::SubmitEvent;
 
-use crate::{error::FetchKleError, utils::fetch_file, models::Colorway};
 use super::{ResultMessage, ResultMessageData};
+use crate::{error::FetchKleError, models::Colorway, utils::fetch_file};
 
 async fn fetch_layout(url: &str) -> Result<kle_serial::Keyboard, FetchKleError> {
     let layout_string = fetch_file(url).await?;
@@ -31,7 +31,7 @@ pub fn KeyboardFromWeb(
                         colorway: Colorway::Ok,
                     }));
                     set_keyboard(Some(keyboard));
-                },
+                }
                 Err(err) => {
                     set_result_message(Some(ResultMessageData {
                         message: view! { cx,

dyesub-tool/src/components/resultmessage.rs

@@ -1,5 +1,5 @@
-use leptos::*;
 use class_list::class_list;
+use leptos::*;
 
 use crate::models::Colorway;
 
@@ -17,15 +17,17 @@ pub fn ResultMessage(cx: Scope, message: ReadSignal<Option<ResultMessageData>>)
         message.track();
         set_open(true);
     });
-    move || view! { cx,
+    move || {
-        <Show when=open fallback=|_| ()>
+        view! { cx,
-            {move || message().map(|ResultMessageData { title, message, colorway }| view! { cx,
+            <Show when=open fallback=|_| ()>
-                <div class=class_list!["box", colorway] style="position: relative">
+                {move || message().map(|ResultMessageData { title, message, colorway }| view! { cx,
-                    <strong class="block titlebar">{title}</strong>
+                    <div class=class_list!["box", colorway] style="position: relative">
-                    <button class="iconbutton" on:click=move |_| set_open(false) style="position: absolute; bottom: 0.5em; right: 0.5em">"×"</button>
+                        <strong class="block titlebar">{title}</strong>
-                    <p>{message}</p>
+                        <button class="iconbutton" on:click=move |_| set_open(false) style="position: absolute; bottom: 0.5em; right: 0.5em">"×"</button>
-                </div>
+                        <p>{message}</p>
-            })}
+                    </div>
-        </Show>
+                })}
+            </Show>
+        }
     }
 }

dyesub-tool/src/error/fetchfile.rs

@@ -16,6 +16,7 @@ impl ToString for FetchFileError {
         match self {
             Request(error) => error.as_string(),
             _ => None,
-        }.unwrap_or_else(|| "".to_string())
+        }
+        .unwrap_or_else(|| "".to_string())
     }
 }

dyesub-tool/src/error/fetchkle.rs

@@ -5,7 +5,9 @@ use super::FetchFileError;
 
 #[derive(From, IntoStaticStr)]
 pub enum FetchKleError {
-    #[strum(serialize = "Invalid source. Must be KLE layout, gist URL, gist ID, or direct URL to JSON file")]
+    #[strum(
+        serialize = "Invalid source. Must be KLE layout, gist URL, gist ID, or direct URL to JSON file"
+    )]
     InvalidSource,
     #[strum(serialize = "Failed to fetch file")]
     FetchFile(FetchFileError),
@@ -25,11 +27,12 @@ impl ToString for FetchKleError {
                         full_error.push_str(&error_info);
                     }
                     full_error
-                },
+                }
                 FetchFileError::ReadToString => error.to_string(),
             }),
             Serde(error) => Some(error.to_string()),
             _ => None,
-        }.unwrap_or_else(|| "".to_string())
+        }
+        .unwrap_or_else(|| "".to_string())
     }
 }

dyesub-tool/src/error/readfile.rs

@@ -17,7 +17,8 @@ impl ToString for ReadFileError {
         use ReadFileError::*;
         match self {
             TextAwait(error) => error.as_string(),
-            _ => None
+            _ => None,
-        }.unwrap_or_else(|| "".to_string())
+        }
+        .unwrap_or_else(|| "".to_string())
     }
 }

dyesub-tool/src/main.rs

@@ -1,13 +1,13 @@
 #![feature(async_closure)]
 
-#[allow(dead_code)]
-mod render;
-mod error;
 mod components;
-mod utils;
+mod error;
 mod models;
 #[allow(dead_code)]
+mod render;
+#[allow(dead_code)]
 pub mod svg;
+mod utils;
 
 use leptos::*;
 use wasm_bindgen::JsCast;

dyesub-tool/src/utils.rs

@@ -1,24 +1,19 @@
 use leptos::*;
 use wasm_bindgen_futures::JsFuture;
-use web_sys::{File, Window, Request};
+use web_sys::{File, Request, Window};
 
-use crate::error::{ReadFileError, FetchFileError};
+use crate::error::{FetchFileError, ReadFileError};
 
 pub fn window() -> Window {
     web_sys::window().unwrap()
 }
 
-pub async fn read_file(
+pub async fn read_file(file: ReadSignal<Option<File>>) -> Result<String, ReadFileError> {
-    file: ReadSignal<Option<File>>,
-) -> Result<String, ReadFileError> {
     let file = match file() {
         Some(file) => file,
         None => return Err(ReadFileError::NoFile),
     };
-    match JsFuture::from(file.text())
+    match JsFuture::from(file.text()).await?.as_string() {
-        .await?
-        .as_string()
-    {
         Some(contents) => Ok(contents),
         None => Err(ReadFileError::ParseToString),
     }