web: cargo fmt

web/src/forms/inputs.rs

@@ -1,7 +1,7 @@
 use paste::paste;
 use std::num::ParseFloatError;
 use yew::prelude::*;
-use yewdux::prelude::{BasicStore};
+use yewdux::prelude::BasicStore;
 use yewdux_functional::use_store;
 use yewdux_input::*;
 

web/src/main.rs

@@ -11,13 +11,13 @@ use yew::prelude::*;
 use yewdux::prelude::{Dispatch, Dispatcher};
 
 mod forms;
-mod ui;
 mod state;
+mod ui;
 mod util;
 
 use forms::*;
-use ui::*;
 use state::*;
+use ui::*;
 use util::*;
 
 struct App {

web/src/state.rs

@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 use std::{convert::TryInto, num::ParseFloatError};
 use svg2gcode::{
-    Settings, ConversionConfig, MachineConfig, PostprocessConfig, SupportedFunctionality,
+    ConversionConfig, MachineConfig, PostprocessConfig, Settings, SupportedFunctionality,
 };
 use svgtypes::Length;
 use yewdux::prelude::{BasicStore, Persistent, PersistentStore};
@@ -57,8 +57,7 @@ impl From<&Settings> for FormState {
         Self {
             tolerance: Ok(settings.conversion.tolerance),
             feedrate: Ok(settings.conversion.feedrate),
-            circular_interpolation: 
-                settings
+            circular_interpolation: settings
                 .machine
                 .supported_functionality
                 .circular_interpolation,
@@ -67,30 +66,10 @@ impl From<&Settings> for FormState {
                 Ok(settings.postprocess.origin[1]),
             ],
             dpi: Ok(settings.conversion.dpi),
-            tool_on_sequence: 
-                settings
-                .machine
-                .tool_on_sequence
-                .clone()
-                .map(Result::Ok),
-            tool_off_sequence: 
-                settings
-                .machine
-                .tool_off_sequence
-                .clone()
-                .map(Result::Ok),
-            begin_sequence: 
-                settings
-                .machine
-                .begin_sequence
-                .clone()
-                .map(Result::Ok),
-            end_sequence: 
-                settings
-                .machine
-                .end_sequence
-                .clone()
-                .map(Result::Ok),
+            tool_on_sequence: settings.machine.tool_on_sequence.clone().map(Result::Ok),
+            tool_off_sequence: settings.machine.tool_off_sequence.clone().map(Result::Ok),
+            begin_sequence: settings.machine.begin_sequence.clone().map(Result::Ok),
+            end_sequence: settings.machine.end_sequence.clone().map(Result::Ok),
         }
     }
 }

web/src/util.rs

@@ -1,6 +1,6 @@
 use std::path::Path;
 use wasm_bindgen::JsCast;
-use web_sys::{HtmlElement, window};
+use web_sys::{window, HtmlElement};
 
 pub fn prompt_download(path: impl AsRef<Path>, content: impl AsRef<[u8]>) {
     let window = window().unwrap();
@@ -8,7 +8,10 @@ pub fn prompt_download(path: impl AsRef<Path>, content: impl AsRef<[u8]>) {
     let hyperlink = document.create_element("a").unwrap();
     let content_base64 = base64::encode(content);
     hyperlink
-        .set_attribute("href", &format!("data:text/plain;base64,{}", content_base64))
+        .set_attribute(
+            "href",
+            &format!("data:text/plain;base64,{}", content_base64),
+        )
         .unwrap();
     hyperlink
         .set_attribute("download", &path.as_ref().display().to_string())