From aa9ad6d9d0438199d4500b07717af4661a6000bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Asger=20Juul=20Brunsh=C3=B8j?= <asgerbrunshoj@gmail.com>
Date: Mon, 17 Feb 2025 13:03:31 +0100
Subject: [PATCH] fix lints

---
 .helix/languages.toml                   |  3 +++
 crates/ascend/src/app.rs                |  2 --
 crates/ascend/src/components/button.rs  |  2 +-
 crates/ascend/src/components/problem.rs |  2 +-
 crates/ascend/src/models.rs             |  4 ++--
 crates/ascend/src/pages/wall.rs         | 13 +++++++++----
 crates/ascend/src/server/operations.rs  |  2 +-
 flake.lock                              |  6 +++---
 flake.nix                               |  7 +------
 9 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/.helix/languages.toml b/.helix/languages.toml
index b868472..6cbd9aa 100644
--- a/.helix/languages.toml
+++ b/.helix/languages.toml
@@ -6,5 +6,8 @@ language-servers = ["rust-analyzer", "tailwindcss-ls"]
 # procMacro = { ignored = { leptos_macro = ["server"] } }
 cargo = { features = ["ssr", "hydrate"] }
 
+[language-server.rust-analyzer.config.check]
+command = "clippy"
+
 [language-server.tailwindcss-ls]
 config = { userLanguages = { rust = "html", "*.rs" = "html" } }
diff --git a/crates/ascend/src/app.rs b/crates/ascend/src/app.rs
index 6d170e4..8efd20c 100644
--- a/crates/ascend/src/app.rs
+++ b/crates/ascend/src/app.rs
@@ -84,6 +84,4 @@ pub fn Home() -> impl IntoView {
             tracing::debug!("navigated");
         }
     });
-
-    leptos::view! {}
 }
diff --git a/crates/ascend/src/components/button.rs b/crates/ascend/src/components/button.rs
index 134f138..ee2dd67 100644
--- a/crates/ascend/src/components/button.rs
+++ b/crates/ascend/src/components/button.rs
@@ -2,7 +2,7 @@ use leptos::prelude::*;
 use web_sys::MouseEvent;
 
 #[component]
-pub fn Button(#[prop(into)] text: String, onclick: impl Fn(MouseEvent) -> () + 'static) -> impl IntoView {
+pub fn Button(#[prop(into)] text: String, onclick: impl Fn(MouseEvent) + 'static) -> impl IntoView {
     view! {
         <button
             on:click=onclick
diff --git a/crates/ascend/src/components/problem.rs b/crates/ascend/src/components/problem.rs
index 6afc219..dd462c6 100644
--- a/crates/ascend/src/components/problem.rs
+++ b/crates/ascend/src/components/problem.rs
@@ -23,7 +23,7 @@ pub fn Problem(#[prop(into)] dim: Signal<models::WallDimensions>, #[prop(into)]
 
     view! {
         <div class="grid grid-cols-[auto,1fr] gap-8">
-            <div class=move || { grid_classes.clone() }>{holds}</div>
+            <div class=move || { grid_classes }>{holds}</div>
         </div>
     }
 }
diff --git a/crates/ascend/src/models.rs b/crates/ascend/src/models.rs
index 7763b8a..9dec211 100644
--- a/crates/ascend/src/models.rs
+++ b/crates/ascend/src/models.rs
@@ -52,7 +52,7 @@ pub mod v2 {
     #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash, derive_more::FromStr, derive_more::Display)]
     pub struct WallUid(pub uuid::Uuid);
     impl WallUid {
-        pub fn new() -> Self {
+        pub fn create() -> Self {
             Self(uuid::Uuid::new_v4())
         }
     }
@@ -70,7 +70,7 @@ pub mod v2 {
     #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Hash, derive_more::FromStr, derive_more::Display)]
     pub struct ProblemUid(pub uuid::Uuid);
     impl ProblemUid {
-        pub fn new() -> Self {
+        pub fn create() -> Self {
             Self(uuid::Uuid::new_v4())
         }
     }
diff --git a/crates/ascend/src/pages/wall.rs b/crates/ascend/src/pages/wall.rs
index a9e5ca3..0f05cd9 100644
--- a/crates/ascend/src/pages/wall.rs
+++ b/crates/ascend/src/pages/wall.rs
@@ -79,19 +79,24 @@ pub fn Wall() -> impl IntoView {
             <StyledHeader items=Signal::derive(header_items) />
 
             <div class="m-2">
-                <Suspense fallback=move || view! { <p>"Loading..."</p> } >
+                <Suspense fallback=move || {
+                    view! { <p>"Loading..."</p> }
+                }>
                     {move || Suspend::new(async move {
                         tracing::info!("executing Suspend future");
                         let wall = wall.await?;
-
                         let v = view! {
                             <div class="grid grid-cols-[auto,1fr] gap-8">
                                 <Grid wall=wall.clone() problem=problem_signal />
 
                                 <div>
                                     <div>
-                                        <p>{move || problem_signal.get().map(|p| p.name.clone())}</p>
-                                        <p>{move || problem_signal.get().map(|p| p.set_by.clone())}</p>
+                                        <p>
+                                            {move || problem_signal.get().map(|p| p.name.clone())}
+                                        </p>
+                                        <p>
+                                            {move || problem_signal.get().map(|p| p.set_by.clone())}
+                                        </p>
                                     </div>
 
                                     <Button
diff --git a/crates/ascend/src/server/operations.rs b/crates/ascend/src/server/operations.rs
index addb02d..13e294b 100644
--- a/crates/ascend/src/server/operations.rs
+++ b/crates/ascend/src/server/operations.rs
@@ -47,7 +47,7 @@ pub(crate) async fn import_mini_moonboard_problems(config: &Config, db: Database
             mini_moonboard::Method::FootlessPlusKickboard => models::Method::FootlessPlusKickboard,
         };
 
-        let problem_id = models::ProblemUid::new();
+        let problem_id = models::ProblemUid::create();
 
         let problem = models::Problem {
             uid: problem_id,
diff --git a/flake.lock b/flake.lock
index 51e5c06..1cc7198 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729251766,
-        "narHash": "sha256-/tOGBbFKgIii6L0VZdJ2MFdhzTt0BtEsAFbWITXeIxA=",
+        "lastModified": 1739793388,
+        "narHash": "sha256-mf0FJ7JJi5gTUFz0SyWF8bqqonxoFD2DG9D785uyYJM=",
         "owner": "plul",
         "repo": "basecamp",
-        "rev": "aae7006aec576140aadf3fdea4ed7eae904dda14",
+        "rev": "f0f702ef6d5e8446eb8cd64e56fe1fe3cfbc677d",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 14bbba8..7d584f0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -75,12 +75,7 @@
         };
 
       nixosModules.default =
-        {
-          config,
-          pkgs,
-          lib,
-          ...
-        }:
+        { config, lib, ... }:
         let
           cfg = config.services.ascend;
         in