diff options
author | metamuffin <metamuffin@disroot.org> | 2025-09-06 23:50:51 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2025-09-06 23:50:51 +0200 |
commit | 356b3b8eebf22083c7d9655bb43e141dd0df732c (patch) | |
tree | 5573ff4290a8d36bb1606562615c3438e3449915 /ui | |
parent | d205173acdd721d581a88fe4788d1ec64b9c2055 (diff) | |
download | jellything-356b3b8eebf22083c7d9655bb43e141dd0df732c.tar jellything-356b3b8eebf22083c7d9655bb43e141dd0df732c.tar.bz2 jellything-356b3b8eebf22083c7d9655bb43e141dd0df732c.tar.zst |
misc changes for current rust nightly
Diffstat (limited to 'ui')
-rw-r--r-- | ui/src/account/mod.rs | 8 | ||||
-rw-r--r-- | ui/src/account/settings.rs | 2 | ||||
-rw-r--r-- | ui/src/admin/log.rs | 2 | ||||
-rw-r--r-- | ui/src/admin/mod.rs | 2 | ||||
-rw-r--r-- | ui/src/admin/user.rs | 6 | ||||
-rw-r--r-- | ui/src/error.rs | 2 | ||||
-rw-r--r-- | ui/src/home.rs | 2 | ||||
-rw-r--r-- | ui/src/items.rs | 2 | ||||
-rw-r--r-- | ui/src/lib.rs | 4 | ||||
-rw-r--r-- | ui/src/node_page.rs | 2 | ||||
-rw-r--r-- | ui/src/search.rs | 2 | ||||
-rw-r--r-- | ui/src/stats.rs | 2 |
12 files changed, 18 insertions, 18 deletions
diff --git a/ui/src/account/mod.rs b/ui/src/account/mod.rs index 36a41c5..91202b0 100644 --- a/ui/src/account/mod.rs +++ b/ui/src/account/mod.rs @@ -24,7 +24,7 @@ impl Page for AccountLogin<'_> { .to_string() } - fn to_render(&self) -> markup::DynRender { + fn to_render(&self) -> markup::DynRender<'_> { markup::new!(@self) } } @@ -32,7 +32,7 @@ impl Page for AccountRegister<'_> { fn title(&self) -> String { tr(*self.lang, "account.register").to_string() } - fn to_render(&self) -> markup::DynRender { + fn to_render(&self) -> markup::DynRender<'_> { markup::new!(@self) } } @@ -40,7 +40,7 @@ impl Page for AccountRegisterSuccess<'_> { fn title(&self) -> String { tr(*self.lang, "account.register").to_string() } - fn to_render(&self) -> markup::DynRender { + fn to_render(&self) -> markup::DynRender<'_> { markup::new!(@self) } } @@ -48,7 +48,7 @@ impl Page for AccountLogout<'_> { fn title(&self) -> String { tr(*self.lang, "account.logout").to_string() } - fn to_render(&self) -> markup::DynRender { + fn to_render(&self) -> markup::DynRender<'_> { markup::new!(@self) } } diff --git a/ui/src/account/settings.rs b/ui/src/account/settings.rs index 7334c62..8a56363 100644 --- a/ui/src/account/settings.rs +++ b/ui/src/account/settings.rs @@ -18,7 +18,7 @@ impl Page for SettingsPage<'_> { fn title(&self) -> String { format!("Settings") } - fn to_render(&self) -> markup::DynRender { + fn to_render(&self) -> markup::DynRender<'_> { markup::new!(@self) } } diff --git a/ui/src/admin/log.rs b/ui/src/admin/log.rs index 8404229..d68be3e 100644 --- a/ui/src/admin/log.rs +++ b/ui/src/admin/log.rs @@ -19,7 +19,7 @@ impl Page for ServerLogPage<'_> { fn class(&self) -> Option<&'static str> { Some("admin_log") } - fn to_render(&self) -> markup::DynRender { + fn to_render(&self) -> markup::DynRender<'_> { markup::new!(@self) } } diff --git a/ui/src/admin/mod.rs b/ui/src/admin/mod.rs index 0d50bca..cb18481 100644 --- a/ui/src/admin/mod.rs +++ b/ui/src/admin/mod.rs @@ -21,7 +21,7 @@ impl Page for AdminDashboardPage<'_> { fn title(&self) -> String { "Admin Dashboard".to_string() } - fn to_render(&self) -> markup::DynRender { + fn to_render(&self) -> markup::DynRender<'_> { markup::new!(@self) } } diff --git a/ui/src/admin/user.rs b/ui/src/admin/user.rs index 919d045..733cf86 100644 --- a/ui/src/admin/user.rs +++ b/ui/src/admin/user.rs @@ -6,7 +6,7 @@ use crate::{ FlashM, Page, - locale::{Language, tr, trs}, + locale::{Language, trs}, scaffold::FlashDisplay, }; use jellycommon::{ @@ -18,7 +18,7 @@ impl Page for AdminUserPage<'_> { fn title(&self) -> String { "User Management".to_string() } - fn to_render(&self) -> markup::DynRender { + fn to_render(&self) -> markup::DynRender<'_> { markup::new!(@self) } } @@ -26,7 +26,7 @@ impl Page for AdminUsersPage<'_> { fn title(&self) -> String { "User Management".to_string() } - fn to_render(&self) -> markup::DynRender { + fn to_render(&self) -> markup::DynRender<'_> { markup::new!(@self) } } diff --git a/ui/src/error.rs b/ui/src/error.rs index ddf05bb..bb8b7b6 100644 --- a/ui/src/error.rs +++ b/ui/src/error.rs @@ -11,7 +11,7 @@ impl Page for ErrorPage { fn title(&self) -> String { "Error".to_string() } - fn to_render(&self) -> markup::DynRender { + fn to_render(&self) -> markup::DynRender<'_> { markup::new!(@self) } } diff --git a/ui/src/home.rs b/ui/src/home.rs index 21ce740..6fbd56f 100644 --- a/ui/src/home.rs +++ b/ui/src/home.rs @@ -32,7 +32,7 @@ impl Page for HomePage<'_> { fn title(&self) -> String { tr(*self.lang, "home").to_string() } - fn to_render(&self) -> DynRender { + fn to_render(&self) -> DynRender<'_> { markup::new!(@self) } } diff --git a/ui/src/items.rs b/ui/src/items.rs index 29bc78c..f4503b7 100644 --- a/ui/src/items.rs +++ b/ui/src/items.rs @@ -40,7 +40,7 @@ impl Page for ItemsPage<'_> { fn title(&self) -> String { tr(*self.lang, "home").to_string() } - fn to_render(&self) -> DynRender { + fn to_render(&self) -> DynRender<'_> { markup::new!(@self) } } diff --git a/ui/src/lib.rs b/ui/src/lib.rs index 786646d..b454fc1 100644 --- a/ui/src/lib.rs +++ b/ui/src/lib.rs @@ -58,7 +58,7 @@ pub fn get_slogan() -> String { /// that generate rendering code because of compile speed. pub trait Page { fn title(&self) -> String; - fn to_render(&self) -> DynRender; + fn to_render(&self) -> DynRender<'_>; fn class(&self) -> Option<&'static str> { None } @@ -92,7 +92,7 @@ impl Page for CustomPage { fn title(&self) -> String { self.title.clone() } - fn to_render(&self) -> DynRender { + fn to_render(&self) -> DynRender<'_> { markup::new!(@markup::raw(&self.body)) } } diff --git a/ui/src/node_page.rs b/ui/src/node_page.rs index 45cf18c..39b66df 100644 --- a/ui/src/node_page.rs +++ b/ui/src/node_page.rs @@ -35,7 +35,7 @@ impl Page for NodePage<'_> { Some("node-page") } } - fn to_render(&self) -> markup::DynRender { + fn to_render(&self) -> markup::DynRender<'_> { markup::new!(@self) } } diff --git a/ui/src/search.rs b/ui/src/search.rs index f252620..106913a 100644 --- a/ui/src/search.rs +++ b/ui/src/search.rs @@ -19,7 +19,7 @@ impl Page for SearchPage<'_> { fn class(&self) -> Option<&'static str> { Some("search") } - fn to_render(&self) -> DynRender { + fn to_render(&self) -> DynRender<'_> { markup::new!(@self) } } diff --git a/ui/src/stats.rs b/ui/src/stats.rs index 11163f3..6be30bd 100644 --- a/ui/src/stats.rs +++ b/ui/src/stats.rs @@ -19,7 +19,7 @@ impl Page for StatsPage<'_> { fn title(&self) -> String { tr(*self.lang, "stats.title").to_string() } - fn to_render(&self) -> markup::DynRender { + fn to_render(&self) -> markup::DynRender<'_> { markup::new!(@self) } } |