Removed unnecessary dereferences and applied formatting fixes

Co-authored-by: Julien Cretin <github@ia0.eu>
google · Jun 1, 2024 · f2f71f1 · f2f71f1
1 parent a0f7c26
commit f2f71f1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/crates/runner-host/crates/web-client/src/board.rs b/crates/runner-host/crates/web-client/src/board.rs
@@ -50,7 +50,7 @@ pub fn Board(Props { command_state, on_board_ready, on_event }: &Props) -> Html
                 board_config.iter().map(|component| match component {
                     Component::Button{id} => html!(<Button id={id} on_event={on_event} />),
                     Component::MonochromeLed{id} => html! {
-                        <LED id={id} command_state={command_state.clone()}/>
+                        <LED id={id} command_state={command_state.clone()} />
                     }
                 }).collect::<Html>()
             } else {

diff --git a/crates/runner-host/crates/web-client/src/board_components/button.rs b/crates/runner-host/crates/web-client/src/board_components/button.rs
@@ -25,11 +25,11 @@ pub struct Props {
 
 #[function_component]
 pub fn Button(Props { id, on_event }: &Props) -> Html {
+    let id = *id;
     let pressed = use_state(|| false);
     let press = Callback::from({
         let pressed = pressed.clone();
         let on_event = on_event.clone();
-        let id = *id;
         move |_| {
             info!("Pressed button id: {id}");
             pressed.set(true);
@@ -40,11 +40,10 @@ pub fn Button(Props { id, on_event }: &Props) -> Html {
     let unpress = Callback::from({
         let pressed = pressed.clone();
         let on_event = on_event.clone();
-        let id = *id;
         move |_| {
             info!("Unpressed button id: {id}");
-            // Necessary because it may also be triggered when the mouse
-            // stops hovering over the button.
+            // Necessary because it may also be triggered when the mouse stops hovering over the
+            // button.
             if *pressed {
                 pressed.set(false);
                 on_event.emit(Event::Button { component_id: id, state: ButtonState::Released });

diff --git a/crates/runner-host/crates/web-client/src/board_components/led.rs b/crates/runner-host/crates/web-client/src/board_components/led.rs
@@ -25,11 +25,11 @@ pub struct Props {
 
 #[function_component]
 pub fn LED(Props { id, command_state }: &Props) -> Html {
+    let id = *id;
     let lit = use_state(|| false);
     let command_state = command_state.clone();
     use_effect_with(command_state, {
         let lit = lit.clone();
-        let id = *id;
         move |command_state| {
             if let Some(Command::Set { component_id, state }) = &**command_state {
                 if *component_id == id {
@@ -47,7 +47,6 @@ pub fn LED(Props { id, command_state }: &Props) -> Html {
                 data="components/monochrome_led_on.svg"
                 style={if *lit { "" } else { "display: none;" }}
             />
-
             <object
                 class="led"
                 type="image/svg+xml"

diff --git a/crates/runner-host/crates/web-client/src/hooks.rs b/crates/runner-host/crates/web-client/src/hooks.rs
@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 use log::{info, warn};
 use web_common::{Command, Event};
 use yew::prelude::*;