diff options
| author | metamuffin <metamuffin@disroot.org> | 2026-03-07 23:28:45 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2026-03-07 23:28:45 +0100 |
| commit | 9d1e1772c02032f70b6db584dddae8fd06b490d6 (patch) | |
| tree | 9d97b4d3e1252c4b99f30a19f339700eaab44c45 /server | |
| parent | d1b7691adb7c40bf21053d324fdac16c544cd536 (diff) | |
| download | jellything-9d1e1772c02032f70b6db584dddae8fd06b490d6.tar jellything-9d1e1772c02032f70b6db584dddae8fd06b490d6.tar.bz2 jellything-9d1e1772c02032f70b6db584dddae8fd06b490d6.tar.zst | |
manual clippy
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/routes/account/mod.rs | 5 | ||||
| -rw-r--r-- | server/src/routes/items.rs | 3 | ||||
| -rw-r--r-- | server/src/routes/stream.rs | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/server/src/routes/account/mod.rs b/server/src/routes/account/mod.rs index e15df9e..1ca0ce1 100644 --- a/server/src/routes/account/mod.rs +++ b/server/src/routes/account/mod.rs @@ -58,6 +58,7 @@ pub struct LoginForm { } #[post("/account/login", data = "<form>")] +#[allow(clippy::type_complexity)] pub fn r_account_login_post( ri: RequestInfo<'_>, jar: &CookieJar, @@ -83,7 +84,7 @@ pub fn r_account_login_post( }; if need_pw_change { if let Some(new_password) = &form.new_password { - let password_hash = hash_password(&form.username, &new_password); + let password_hash = hash_password(&form.username, new_password); ri.state.database.transaction(&mut |txn| { let user_row = txn.query_single(Query { filter: Filter::Match(Path(vec![USER_LOGIN.0]), form.username.clone().into()), @@ -94,7 +95,7 @@ pub fn r_account_login_post( user = user.remove(USER_PASSWORD_REQUIRE_CHANGE); user = user.insert(USER_PASSWORD, &password_hash); if let Some(name) = &form.display_name { - user = user.insert(USER_NAME, &name); + user = user.insert(USER_NAME, name); } txn.update(ur, user)?; } diff --git a/server/src/routes/items.rs b/server/src/routes/items.rs index 0f7386c..84869a1 100644 --- a/server/src/routes/items.rs +++ b/server/src/routes/items.rs @@ -39,7 +39,6 @@ pub fn r_items(ri: RequestInfo, cont: Option<&str>) -> MyResult<RawHtml<String>> offset: None, }), continuation: cont_in.clone(), - ..Default::default() })? .take(64) .collect::<Result<Vec<_>, _>>()?; @@ -59,7 +58,7 @@ pub fn r_items(ri: RequestInfo, cont: Option<&str>) -> MyResult<RawHtml<String>> items: &items .iter() .map(|node| Nku { - node: Cow::Borrowed(&node), + node: Cow::Borrowed(node), userdata: Cow::Borrowed(EMPTY), role: None, }) diff --git a/server/src/routes/stream.rs b/server/src/routes/stream.rs index f117070..9868d6a 100644 --- a/server/src/routes/stream.rs +++ b/server/src/routes/stream.rs @@ -95,10 +95,10 @@ pub async fn r_stream( let mut sources = BTreeSet::new(); for track in node.iter(NO_TRACK) { - if let Some(s) = track.get(TR_SOURCE) { - if let Some(path) = s.get(TRSOURCE_LOCAL_PATH) { - sources.insert(path.into()); - } + if let Some(s) = track.get(TR_SOURCE) + && let Some(path) = s.get(TRSOURCE_LOCAL_PATH) + { + sources.insert(path.into()); } } let media = Arc::new(SMediaInfo { |