diff --git a/src/database/models/categories.rs b/src/database/models/categories.rs index 2f11738a..9eac9b61 100644 --- a/src/database/models/categories.rs +++ b/src/database/models/categories.rs @@ -111,7 +111,7 @@ impl Category { impl<'a> CategoryBuilder<'a> { /// The name of the category. Must be ASCII alphanumeric or `-`/`_` - pub fn name(mut self, name: &'a str) -> Result, DatabaseError> { + pub fn name(self, name: &'a str) -> Result, DatabaseError> { if name .chars() .all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_') @@ -236,7 +236,7 @@ impl Loader { impl<'a> LoaderBuilder<'a> { /// The name of the loader. Must be ASCII alphanumeric or `-`/`_` - pub fn name(mut self, name: &'a str) -> Result, DatabaseError> { + pub fn name(self, name: &'a str) -> Result, DatabaseError> { if name .chars() .all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_') @@ -363,7 +363,7 @@ impl GameVersion { impl<'a> GameVersionBuilder<'a> { /// The game version. Spaces must be replaced with '_' for it to be valid - pub fn version(mut self, version: &'a str) -> Result, DatabaseError> { + pub fn version(self, version: &'a str) -> Result, DatabaseError> { if version .chars() .all(|c| c.is_ascii_alphanumeric() || "-_.".contains(c)) diff --git a/src/database/models/ids.rs b/src/database/models/ids.rs index 364c27c2..055c48e8 100644 --- a/src/database/models/ids.rs +++ b/src/database/models/ids.rs @@ -9,7 +9,6 @@ macro_rules! generate_ids { $vis async fn $function_name( con: &mut sqlx::Transaction<'_, sqlx::Postgres>, ) -> Result<$return_type, DatabaseError> { - use rand::Rng; let mut rng = rand::thread_rng(); let length = $id_length; let mut id = random_base62_rng(&mut rng, length); diff --git a/src/database/models/mod.rs b/src/database/models/mod.rs index e0f80a5b..2db3b573 100644 --- a/src/database/models/mod.rs +++ b/src/database/models/mod.rs @@ -1,4 +1,4 @@ -#![allow(unused)] +#![allow(dead_code)] // TODO: remove attr once routes are created use thiserror::Error; diff --git a/src/database/models/version_item.rs b/src/database/models/version_item.rs index 909f69c5..9d404caa 100644 --- a/src/database/models/version_item.rs +++ b/src/database/models/version_item.rs @@ -1,4 +1,3 @@ -use super::categories::{GameVersion, Loader}; use super::ids::*; use super::DatabaseError; @@ -183,8 +182,6 @@ impl Version { where E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy, { - use sqlx::Done; - let result = sqlx::query!( " SELECT EXISTS(SELECT 1 FROM versions WHERE id = $1) @@ -220,7 +217,7 @@ impl Version { use futures::TryStreamExt; - let mut files = sqlx::query!( + let files = sqlx::query!( " SELECT files.id, files.url, files.filename FROM files WHERE files.version_id = $1 @@ -434,7 +431,6 @@ impl Version { if let Some(row) = result { use futures::TryStreamExt; - use sqlx::Row; let game_versions: Vec = sqlx::query!( " @@ -482,7 +478,7 @@ impl Version { .await?; for file in files.iter_mut() { - let mut files = sqlx::query!( + let files = sqlx::query!( " SELECT hashes.algorithm, hashes.hash FROM hashes WHERE hashes.file_id = $1