From a9bd890d162c66d68f5691175f79be0d522dc389 Mon Sep 17 00:00:00 2001 From: Doloro1978 Date: Thu, 17 Sep 2026 18:57:35 +0100 Subject: [PATCH] cargo clippy fix --- crates/entity/src/stream_session.rs | 8 ++++---- crates/entity/src/users.rs | 8 ++++---- crates/server/src/audio.rs | 2 +- crates/server/src/http.rs | 10 ++++------ 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/crates/entity/src/stream_session.rs b/crates/entity/src/stream_session.rs index 32fcf6a..64f5233 100644 --- a/crates/entity/src/stream_session.rs +++ b/crates/entity/src/stream_session.rs @@ -51,20 +51,20 @@ impl Model { .await } pub async fn get_all_active_sessions(db: &DatabaseConnection) -> Result, DbErr> { - Ok(Entity::find() + Entity::find() .filter(Column::EndedAt.is_null()) .all(db) - .await?) + .await } pub async fn get_active_by_stream_key_id( db: &DatabaseConnection, stream_key_id: i32, ) -> Result, DbErr> { - Ok(Entity::find() + Entity::find() .filter(Column::StreamKeyId.eq(stream_key_id)) .filter(Column::EndedAt.is_null()) .one(db) - .await?) + .await } pub async fn clean_unended_streams(db: &DatabaseConnection) -> Result { diff --git a/crates/entity/src/users.rs b/crates/entity/src/users.rs index 32753a2..98915f4 100644 --- a/crates/entity/src/users.rs +++ b/crates/entity/src/users.rs @@ -58,18 +58,18 @@ impl Entity { if let Some(x) = sessions { Entity::find_by_id(x.id_user).one(db).await } else { - return Ok(None); + Ok(None) } } pub async fn find_by_username( db: &DatabaseConnection, username: String, ) -> Result, DbErr> { - let user = Entity::find() + + Entity::find() .filter(Column::Username.eq(username)) .one(db) - .await; - user + .await } } diff --git a/crates/server/src/audio.rs b/crates/server/src/audio.rs index 4267934..15ed191 100644 --- a/crates/server/src/audio.rs +++ b/crates/server/src/audio.rs @@ -44,7 +44,7 @@ impl AudioProcesser { pub fn encode(&mut self, frame: AudioFrame) -> Vec { let mut samples: Vec = frame .data - .chunks_exact(4) + .as_chunks::<4>().0.iter() .map(|b| f32::from_le_bytes([b[0], b[1], b[2], b[3]])) .collect(); diff --git a/crates/server/src/http.rs b/crates/server/src/http.rs index 3ac4e2f..f6d7a85 100644 --- a/crates/server/src/http.rs +++ b/crates/server/src/http.rs @@ -162,16 +162,14 @@ async fn edit_stream_key( } } // Empty values are allowed (they clear the field). - if let Some(custom_id) = payload.custom_id.as_deref() { - if !custom_id.is_empty() && !valid_charset(custom_id) { + if let Some(custom_id) = payload.custom_id.as_deref() + && !custom_id.is_empty() && !valid_charset(custom_id) { return Err(HttpError::BadRequest("invalid custom id".into())); } - } - if let Some(pwd) = payload.password.as_deref() { - if !pwd.is_empty() && !valid_charset(pwd) { + if let Some(pwd) = payload.password.as_deref() + && !pwd.is_empty() && !valid_charset(pwd) { return Err(HttpError::BadRequest("invalid password".into())); } - } let stream_key = stream_key::Entity::find_by_id(payload.id) .one(&state.db)