chore: update dependencies and improve code logic in various files

Author: Phosphorus-M

Cargo.lock

@@ -28,7 +28,7 @@ cargo clippy -- -D warnings
 '''
 
 [tasks.leptos-format]
-install_crate = { crate_name = "leptosfmt", version = "0.1.13" }
+install_crate = { crate_name = "leptosfmt", version = "0.1.33" }
 command = "leptosfmt"
 args = ["."]
 

Makefile.toml

@@ -145,7 +145,7 @@ fn generate_projects(path: &Path) {
             }
             let file_path = file.path();
 
-            if !file_path.extension().is_some_and(|e| e == "toml") {
+            if file_path.extension().is_none_or(|e| e != "toml") {
                 let file_name = file.file_name();
                 let file_name = file_name.to_str().unwrap();
                 // Copy images or other files

build.rs

@@ -1,5 +1,5 @@
 [toolchain]
 components = ["rust-analyzer", "rustfmt", "clippy"]
-channel = "nightly-2024-02-12"
+channel = "nightly-2025-02-12"
 profile = "minimal"
 targets = ["wasm32-unknown-unknown"]

rust-toolchain.toml

@@ -6,19 +6,22 @@ use leptos_router::use_query_map;
 pub fn Hero() -> impl IntoView {
     let query_params = use_query_map();
 
-    let image_src = if query_params.get().get("uwu").is_some() && cfg!(debug_assertions) {
-        "./assets/RustLang_Uwu.png"
-    } else {
-        "./assets/ferris-hero.avif"
+    let is_in_debug_mode = cfg!(debug_assertions);
+    let uwu = query_params.get().get("uwu").is_some();
+
+    let image_src = match (is_in_debug_mode, uwu) {
+        (true, true) => "./assets/RustLang_uwu.png",
+        (true, false) => "./assets/ferris-hero.avif",
+        (false, false) => "./ferris-hero.avif",
+        (false, true) => "./RustLang_uwu.png",
     };
 
-    let uwu = query_params.get().get("uwu").is_some();
 
     view! {
         <section
             class=(
                 "grid items-center py-14 lg:py-32 px-4 gap-x-20 gap-y-10 lg:grid-cols-2 w-full",
-                move || uwu == false,
+                move || !uwu,
             )
             class="grid items-center justify-center"
         >

src/components/hero.rs

@@ -1,9 +1,10 @@
+#![allow(dead_code)]
 use leptos::{create_signal, island, view, IntoView, SignalUpdate};
 
 use rand::seq::SliceRandom;
 
 #[island]
-pub fn SloganButton(#[prop(into)] uwu: Option<bool>) -> impl IntoView {
+pub fn SloganButton(uwu: bool) -> impl IntoView {
     let slogans = [
         "Una comunidad de gente mal intencionada y tonta.",
         "Rust the lang, not the game",
@@ -43,7 +44,7 @@ pub fn SloganButton(#[prop(into)] uwu: Option<bool>) -> impl IntoView {
         <div
             class=(
                 "flex select-none justify-center lg:justify-center dark:text-white drop-shadow-[7px_7px_2px_rgba(0,0,0,.5)] hover:drop-shadow-none dark:transition-all dark:ease-in-out  dark:delay-75 ",
-                move || uwu == Some(true),
+                uwu,
             )
             class="flex select-none items-center justify-center lg:justify-start group dark:text-white drop-shadow-[7px_7px_2px_rgba(0,0,0,.5)] hover:drop-shadow-none dark:transition-all dark:ease-in-out  dark:delay-75 "
             on:click=click_handler

src/components/slogan_button.rs

@@ -99,11 +99,8 @@ pub async fn fetch_contributors() -> Vec<Contributor> {
         .as_array()
         .unwrap_or(&Vec::new())
         .iter()
-        .filter_map(|repo| {
-            (!repo["collaborators"].is_null())
-                .then(|| repo["collaborators"]["nodes"].as_array().unwrap())
-        })
-        .flatten()
+        .filter(|&repo| (!repo["collaborators"].is_null()))
+        .flat_map(|repo| repo["collaborators"]["nodes"].as_array().unwrap())
         .filter_map(|c| leptos::serde_json::from_value::<Contributor>(c.clone()).ok())
         .fold(HashMap::new(), |prev, c| {
             let mut prev = prev;
@@ -159,10 +156,10 @@ pub fn Contributors() -> impl IntoView {
                     Gracias al esfuerzo y dedicación de estos extraordinarios colaboradores open source, los servicios y páginas de nuestra comunidad se mantienen activos y en constante evolución. Su pasión por el código abierto y el desarrollo de Rust es el corazón que impulsa nuestro crecimiento.
                 </p>
                 <p class="md:max-w-[800px] mb-2">
-                    Te invitamos a unirte a esta vibrante comunidad, explorar nuestros repositorios en
+                    "Te invitamos a unirte a esta vibrante comunidad, explorar nuestros repositorios en "
                     <a href="https://github.com/RustLangES" class="underline" target="_blank">
                         GitHub
-                    </a> y contribuir con tu talento.
+                    </a> " y contribuir con tu talento."
                 </p>
                 <p class="md:max-w-[800px]">
                     <strong>Juntos</strong>