upgrade deps + clippy

8 files changed, 44 insertions, 44 deletions

diff --git a/ui/Cargo.toml b/ui/Cargo.toml
index 0a2fb5a..982efd9 100644
--- a/ui/Cargo.toml
+++ b/ui/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2024"
 markup = "0.15.0"
 jellycommon = { path = "../common" }
 humansize = "2.1.3"
-serde = { version = "1.0.217", features = ["derive", "rc"] }
-serde_json = "1.0.140"
-vte = "0.14.1"
+serde = { version = "1.0.228", features = ["derive", "rc"] }
+serde_json = "1.0.145"
+vte = "0.15.0"
diff --git a/ui/src/account/mod.rs b/ui/src/account/mod.rs
index 91202b0..2fbb6c7 100644
--- a/ui/src/account/mod.rs
+++ b/ui/src/account/mod.rs
@@ -56,23 +56,23 @@ impl Page for AccountLogout<'_> {
 markup::define! {
     AccountRegister<'a>(lang: &'a Language) {
         form.account[method="POST", action=""] {
-            h1 { @trs(&lang, "account.register") }
+            h1 { @trs(lang, "account.register") }
 
-            label[for="inp-invitation"] { @trs(&lang, "account.register.invitation") }
+            label[for="inp-invitation"] { @trs(lang, "account.register.invitation") }
             input[type="text", id="inp-invitation", name="invitation"]; br;
 
-            label[for="inp-username"] { @trs(&lang, "account.username") }
+            label[for="inp-username"] { @trs(lang, "account.username") }
             input[type="text", id="inp-username", name="username"]; br;
-            label[for="inp-password"] { @trs(&lang, "account.password") }
+            label[for="inp-password"] { @trs(lang, "account.password") }
             input[type="password", id="inp-password", name="password"]; br;
 
             input[type="submit", value=&*tr(**lang, "account.register.submit")];
 
-            p { @trs(&lang, "account.register.login") " " a[href=u_account_login()] { @trs(&lang, "account.register.login_here") } }
+            p { @trs(lang, "account.register.login") " " a[href=u_account_login()] { @trs(lang, "account.register.login_here") } }
         }
     }
     AccountRegisterSuccess<'a>(lang: &'a Language, logged_in: bool) {
-        h1 { @trs(&lang, if *logged_in {
+        h1 { @trs(lang, if *logged_in {
             "account.register.success.switch"
         } else {
             "account.register.success"
@@ -82,24 +82,24 @@ markup::define! {
         form.account[method="POST", action=""] {
             h1 { @self.title() }
 
-            label[for="inp-username"] { @trs(&lang, "account.username") }
+            label[for="inp-username"] { @trs(lang, "account.username") }
             input[type="text", id="inp-username", name="username"]; br;
-            label[for="inp-password"] { @trs(&lang, "account.password") }
+            label[for="inp-password"] { @trs(lang, "account.password") }
             input[type="password", id="inp-password", name="password"]; br;
 
             input[type="submit", value=&*tr(**lang, if *logged_in { "account.login.submit.switch" } else { "account.login.submit" })];
 
             @if *logged_in {
-                p { @trs(&lang, "account.login.register.switch") " " a[href=u_account_register()] { @trs(&lang, "account.login.register_here") } }
+                p { @trs(lang, "account.login.register.switch") " " a[href=u_account_register()] { @trs(lang, "account.login.register_here") } }
             } else {
-                p { @trs(&lang, "account.login.cookie_note") }
-                p { @trs(&lang, "account.login.register") " " a[href=u_account_register()] { @trs(&lang, "account.login.register_here") } }
+                p { @trs(lang, "account.login.cookie_note") }
+                p { @trs(lang, "account.login.register") " " a[href=u_account_register()] { @trs(lang, "account.login.register_here") } }
             }
         }
     }
     AccountLogout<'a>(lang: &'a Language) {
         form.account[method="POST", action=""] {
-            h1 { @trs(&lang, "account.logout") }
+            h1 { @trs(lang, "account.logout") }
             input[type="submit", value=&*tr(**lang, "account.logout.submit")];
         }
     }
diff --git a/ui/src/account/settings.rs b/ui/src/account/settings.rs
index 8a56363..551e362 100644
--- a/ui/src/account/settings.rs
+++ b/ui/src/account/settings.rs
@@ -16,7 +16,7 @@ use markup::RenderAttributeValue;
 
 impl Page for SettingsPage<'_> {
     fn title(&self) -> String {
-        format!("Settings")
+        "Settings".to_string()
     }
     fn to_render(&self) -> markup::DynRender<'_> {
         markup::new!(@self)
@@ -27,10 +27,10 @@ markup::define! {
     SettingsPage<'a>(session: &'a SessionInfo, lang: &'a Language, flash: &'a FlashM) {
         h1 { "Settings" }
         @FlashDisplay {flash}
-        h2 { @trs(&lang, "account") }
+        h2 { @trs(lang, "account") }
         a.switch_account[href=u_account_login()] { "Switch Account" }
         form[method="POST", action=u_account_settings()] {
-            label[for="username"] { @trs(&lang, "account.username") }
+            label[for="username"] { @trs(lang, "account.username") }
             input[type="text", id="username", disabled, value=&session.user.name];
             input[type="submit", disabled, value=&*tr(**lang, "settings.immutable")];
         }
@@ -44,10 +44,10 @@ markup::define! {
             input[type="password", id="password", name="password"];
             input[type="submit", value=&*tr(**lang, "settings.update")];
         }
-        h2 { @trs(&lang, "settings.appearance") }
+        h2 { @trs(lang, "settings.appearance") }
         form[method="POST", action=u_account_settings()] {
             fieldset {
-                legend { @trs(&lang, "settings.appearance.theme") }
+                legend { @trs(lang, "settings.appearance.theme") }
                 @for theme in Theme::ALL {
                     label { input[type="radio", name="theme", value=A(*theme), checked=session.user.theme==*theme]; @trs(lang, &format!("theme.{theme}")) } br;
                 }
@@ -56,7 +56,7 @@ markup::define! {
         }
         form[method="POST", action=u_account_settings()] {
             fieldset {
-                legend { @trs(&lang, "settings.player_preference") }
+                legend { @trs(lang, "settings.player_preference") }
                 @for kind in PlayerKind::ALL {
                     label { input[type="radio", name="player_preference", value=A(*kind), checked=session.user.player_preference==*kind]; @trs(lang, &format!("player_kind.{kind}")) } br;
                 }
diff --git a/ui/src/filter_sort.rs b/ui/src/filter_sort.rs
index 0ecd8ae..0e9ff7b 100644
--- a/ui/src/filter_sort.rs
+++ b/ui/src/filter_sort.rs
@@ -8,7 +8,7 @@ use crate::locale::{Language, trs};
 use jellycommon::api::{FilterProperty, NodeFilterSort, SortOrder, SortProperty};
 use markup::RenderAttributeValue;
 
-const SORT_CATS: &'static [(&'static str, &'static [(SortProperty, &'static str)])] = {
+const SORT_CATS: &[(&str, &[(SortProperty, &str)])] = {
     use SortProperty::*;
     &[
         (
@@ -35,7 +35,7 @@ const SORT_CATS: &'static [(&'static str, &'static [(SortProperty, &'static str)
         ),
     ]
 };
-const FILTER_CATS: &'static [(&'static str, &'static [(FilterProperty, &'static str)])] = {
+const FILTER_CATS: &[(&str, &[(FilterProperty, &str)])] = {
     use FilterProperty::*;
     &[
         (
diff --git a/ui/src/home.rs b/ui/src/home.rs
index 6fbd56f..a67298a 100644
--- a/ui/src/home.rs
+++ b/ui/src/home.rs
@@ -13,15 +13,15 @@ use markup::DynRender;
 
 markup::define! {
     HomePage<'a>(lang: &'a Language, r: ApiHomeResponse) {
-        h2 { @tr(**lang, &"home.bin.root").replace("{title}", &CONF.brand) }
+        h2 { @tr(**lang, "home.bin.root").replace("{title}", &CONF.brand) }
         ul.children.hlist {@for (node, udata) in &r.toplevel {
-            li { @NodeCard { node, udata, lang: &lang } }
+            li { @NodeCard { node, udata, lang } }
         }}
         @for (name, nodes) in &r.categories {
             @if !nodes.is_empty() {
-                h2 { @trs(&lang, &name) }
+                h2 { @trs(lang, name) }
                 ul.children.hlist {@for (node, udata) in nodes {
-                    li { @NodeCard { node, udata, lang: &lang } }
+                    li { @NodeCard { node, udata, lang } }
                 }}
             }
         }
diff --git a/ui/src/items.rs b/ui/src/items.rs
index f4503b7..3b80ecc 100644
--- a/ui/src/items.rs
+++ b/ui/src/items.rs
@@ -19,17 +19,17 @@ markup::define! {
     ItemsPage<'a>(lang: &'a Language, r: ApiItemsResponse, filter: &'a NodeFilterSort, page: usize) {
         .page.dir {
             h1 { "All Items" }
-            @NodeFilterSortForm { f: &filter, lang: &lang }
+            @NodeFilterSortForm { f: filter, lang }
             ul.children { @for (node, udata) in &r.items {
-                li {@NodeCard { node, udata, lang: &lang }}
+                li {@NodeCard { node, udata, lang }}
             }}
             p.pagecontrols {
                 span.current { @tr(**lang, "page.curr").replace("{cur}", &(page + 1).to_string()).replace("{max}", &r.pages.to_string()) " " }
                 @if *page > 0 {
-                    a.prev[href=u_items_filter(page - 1, filter)] { @trs(&lang, "page.prev") } " "
+                    a.prev[href=u_items_filter(page - 1, filter)] { @trs(lang, "page.prev") } " "
                 }
                 @if page + 1 < r.pages {
-                    a.next[href=u_items_filter(page + 1, filter)] { @trs(&lang, "page.next") }
+                    a.next[href=u_items_filter(page + 1, filter)] { @trs(lang, "page.next") }
                 }
             }
         }
diff --git a/ui/src/search.rs b/ui/src/search.rs
index 106913a..9bdf4d3 100644
--- a/ui/src/search.rs
+++ b/ui/src/search.rs
@@ -26,16 +26,16 @@ impl Page for SearchPage<'_> {
 
 markup::define! {
     SearchPage<'a>(lang: &'a Language, r: Option<ApiSearchResponse>, query: &'a Option<String>) {
-        h1 { @trs(&lang, "search.title") }
+        h1 { @trs(lang, "search.title") }
         form[action="", method="GET"] {
             input[type="text", name="query", placeholder=&*tr(**lang, "search.placeholder"), value=&query];
             input[type="submit", value="Search"];
         }
         @if let Some(r) = &r {
-            h2 { @trs(&lang, "search.results.title") }
+            h2 { @trs(lang, "search.results.title") }
             p.stats { @tr(**lang, "search.results.stats").replace("{count}", &r.count.to_string()).replace("{dur}", &format!("{:?}", r.duration)) }
             ul.children {@for (node, udata) in r.results.iter() {
-                li { @NodeCard { node, udata, lang: &lang } }
+                li { @NodeCard { node, udata, lang } }
             }}
             // TODO pagination
         }
diff --git a/ui/src/stats.rs b/ui/src/stats.rs
index 6be30bd..0ee2aeb 100644
--- a/ui/src/stats.rs
+++ b/ui/src/stats.rs
@@ -27,7 +27,7 @@ impl Page for StatsPage<'_> {
 markup::define! {
     StatsPage<'a>(lang: &'a Language, r: ApiStatsResponse) {
         .page.stats {
-            h1 { @trs(&lang, "stats.title") }
+            h1 { @trs(lang, "stats.title") }
             p { @raw(tr(**lang, "stats.count")
                 .replace("{count}", &format!("<b>{}</b>", r.total.count))
             )}
@@ -40,17 +40,17 @@ markup::define! {
                 .replace("{size}", &format!("<b>{}</b>", format_size(r.total.average_size() as u64)))
             )}
 
-            h2 { @trs(&lang, "stats.by_kind.title") }
+            h2 { @trs(lang, "stats.by_kind.title") }
             table.striped {
                 tr {
-                    th { @trs(&lang, "stats.by_kind.kind") }
-                    th { @trs(&lang, "stats.by_kind.count") }
-                    th { @trs(&lang, "stats.by_kind.total_size") }
-                    th { @trs(&lang, "stats.by_kind.total_runtime") }
-                    th { @trs(&lang, "stats.by_kind.average_size") }
-                    th { @trs(&lang, "stats.by_kind.average_runtime") }
-                    th { @trs(&lang, "stats.by_kind.max_size") }
-                    th { @trs(&lang, "stats.by_kind.max_runtime") }
+                    th { @trs(lang, "stats.by_kind.kind") }
+                    th { @trs(lang, "stats.by_kind.count") }
+                    th { @trs(lang, "stats.by_kind.total_size") }
+                    th { @trs(lang, "stats.by_kind.total_runtime") }
+                    th { @trs(lang, "stats.by_kind.average_size") }
+                    th { @trs(lang, "stats.by_kind.average_runtime") }
+                    th { @trs(lang, "stats.by_kind.max_size") }
+                    th { @trs(lang, "stats.by_kind.max_runtime") }
                 }
                 @for (k,b) in &r.kinds { tr {
                     td { @format_kind(*k, **lang) }