sync from internal repository

Author: lostmygithubaccount

dkdc-links-py/Cargo.lock

@@ -2,8 +2,8 @@
 
 [package]
 name = "dkdc-links-py"
-version = "4.1.0"
-edition = "2024"
+version = "4.1.1"
+edition = "2021"
 authors = ["Cody <cody@dkdc.dev>"]
 license = "MIT"
 

dkdc-links-py/Cargo.toml

@@ -1,16 +1,14 @@
 [workspace]
 
 [profile.release]
-# fat LTO (lto = true) causes SIGSEGV in nightly rustc with iced's dependency tree.
-# thin LTO gives ~95% of the size/perf benefit without the compiler crash.
-lto = "thin"
+lto = true
 strip = true
 codegen-units = 1
 
 [package]
 name = "dkdc-links"
-version = "4.1.0"
-edition = "2024"
+version = "4.1.1"
+edition = "2021"
 authors = ["Cody <cody@dkdc.dev>"]
 description = "Bookmarks in your terminal"
 repository = "https://github.com/lostmygithubaccount/dkdc-links"

dkdc-links/Cargo.lock

@@ -1,8 +1,8 @@
 //! Desktop app for dkdc-links
 
 use iced::widget::{
-    Column, button, center, checkbox, column, container, mouse_area, row, scrollable, text,
-    text_input,
+    button, center, checkbox, column, container, mouse_area, row, scrollable, text, text_input,
+    Column,
 };
 use iced::{Element, Length, Size, Theme};
 use std::collections::HashSet;
@@ -455,11 +455,11 @@ impl Links {
     fn apply_edit(&mut self, kind: ItemKind, name: &str, field: &str, value: &str) {
         match (kind, field) {
             (ItemKind::Link, "name") => {
-                if value != name
-                    && let Err(e) = self.config.rename_link(name, value)
-                {
-                    self.error = Some(e.to_string());
-                    return;
+                if value != name {
+                    if let Err(e) = self.config.rename_link(name, value) {
+                        self.error = Some(e.to_string());
+                        return;
+                    }
                 }
             }
             (ItemKind::Link, "value") => {
@@ -468,11 +468,11 @@ impl Links {
                 }
             }
             (ItemKind::Alias, "name") => {
-                if value != name
-                    && let Err(e) = self.config.rename_alias(name, value)
-                {
-                    self.error = Some(e.to_string());
-                    return;
+                if value != name {
+                    if let Err(e) = self.config.rename_alias(name, value) {
+                        self.error = Some(e.to_string());
+                        return;
+                    }
                 }
             }
             (ItemKind::Alias, "value") => {
@@ -485,10 +485,10 @@ impl Links {
                 }
             }
             (ItemKind::Group, "name") => {
-                if value != name
-                    && let Some(entries) = self.config.groups.remove(name)
-                {
-                    self.config.groups.insert(value.to_string(), entries);
+                if value != name {
+                    if let Some(entries) = self.config.groups.remove(name) {
+                        self.config.groups.insert(value.to_string(), entries);
+                    }
                 }
             }
             (ItemKind::Group, "value") => {

dkdc-links/Cargo.toml

@@ -1,9 +1,9 @@
 //! Embedded HTMX webapp for dkdc-links
 
-use axum::Router;
 use axum::extract::{Path, Query, State};
 use axum::response::Html;
 use axum::routing::{get, post};
+use axum::Router;
 use std::net::SocketAddr;
 use std::sync::{Arc, Mutex};
 
@@ -718,17 +718,18 @@ async fn edit_link(
     let new_name = form.get("new_name").filter(|s| !s.is_empty());
     let new_url = form.get("new_url").filter(|s| !s.is_empty());
 
-    if let Some(new_url) = new_url
-        && let Some(url) = config.links.get_mut(&name)
-    {
-        *url = new_url.clone();
+    if let Some(new_url) = new_url {
+        if let Some(url) = config.links.get_mut(&name) {
+            *url = new_url.clone();
+        }
     }
 
-    if let Some(new_name) = new_name
-        && new_name != &name
-        && let Err(e) = config.rename_link(&name, new_name)
-    {
-        return content_err(&state, &e.to_string());
+    if let Some(new_name) = new_name {
+        if new_name != &name {
+            if let Err(e) = config.rename_link(&name, new_name) {
+                return content_err(&state, &e.to_string());
+            }
+        }
     }
 
     state.save_config(&config);
@@ -756,11 +757,12 @@ async fn edit_alias(
         }
     }
 
-    if let Some(new_name) = new_name
-        && new_name != &name
-        && let Err(e) = config.rename_alias(&name, new_name)
-    {
-        return content_err(&state, &e.to_string());
+    if let Some(new_name) = new_name {
+        if new_name != &name {
+            if let Err(e) = config.rename_alias(&name, new_name) {
+                return content_err(&state, &e.to_string());
+            }
+        }
     }
 
     state.save_config(&config);
@@ -800,11 +802,12 @@ async fn edit_group(
         }
     }
 
-    if let Some(new_name) = new_name
-        && new_name != &name
-        && let Some(entries) = config.groups.remove(&name)
-    {
-        config.groups.insert(new_name.clone(), entries);
+    if let Some(new_name) = new_name {
+        if new_name != &name {
+            if let Some(entries) = config.groups.remove(&name) {
+                config.groups.insert(new_name.clone(), entries);
+            }
+        }
     }
 
     state.save_config(&config);

dkdc-links/src/app.rs

@@ -1,6 +1,6 @@
 [project]
 name = "dkdc-links"
-version = "4.1.0"
+version = "4.1.1"
 description = "Bookmarks in your terminal"
 authors = [{ name = "Cody", email = "cody@dkdc.dev" }]
 requires-python = ">=3.11"

dkdc-links/src/webapp.rs

@@ -0,0 +1,2 @@
+[toolchain]
+channel = "stable"