You've already forked AstralRinth
forked from didirus/AstralRinth
Await an unused future and change #![allow(unused)] to dead_code (#88)
Co-authored-by: Geometrically <18202329+Geometrically@users.noreply.github.com>
This commit is contained in:
@@ -111,7 +111,7 @@ impl Category {
|
|||||||
|
|
||||||
impl<'a> CategoryBuilder<'a> {
|
impl<'a> CategoryBuilder<'a> {
|
||||||
/// The name of the category. Must be ASCII alphanumeric or `-`/`_`
|
/// The name of the category. Must be ASCII alphanumeric or `-`/`_`
|
||||||
pub fn name(mut self, name: &'a str) -> Result<CategoryBuilder<'a>, DatabaseError> {
|
pub fn name(self, name: &'a str) -> Result<CategoryBuilder<'a>, DatabaseError> {
|
||||||
if name
|
if name
|
||||||
.chars()
|
.chars()
|
||||||
.all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_')
|
.all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_')
|
||||||
@@ -236,7 +236,7 @@ impl Loader {
|
|||||||
|
|
||||||
impl<'a> LoaderBuilder<'a> {
|
impl<'a> LoaderBuilder<'a> {
|
||||||
/// The name of the loader. Must be ASCII alphanumeric or `-`/`_`
|
/// The name of the loader. Must be ASCII alphanumeric or `-`/`_`
|
||||||
pub fn name(mut self, name: &'a str) -> Result<LoaderBuilder<'a>, DatabaseError> {
|
pub fn name(self, name: &'a str) -> Result<LoaderBuilder<'a>, DatabaseError> {
|
||||||
if name
|
if name
|
||||||
.chars()
|
.chars()
|
||||||
.all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_')
|
.all(|c| c.is_ascii_alphanumeric() || c == '-' || c == '_')
|
||||||
@@ -363,7 +363,7 @@ impl GameVersion {
|
|||||||
|
|
||||||
impl<'a> GameVersionBuilder<'a> {
|
impl<'a> GameVersionBuilder<'a> {
|
||||||
/// The game version. Spaces must be replaced with '_' for it to be valid
|
/// The game version. Spaces must be replaced with '_' for it to be valid
|
||||||
pub fn version(mut self, version: &'a str) -> Result<GameVersionBuilder<'a>, DatabaseError> {
|
pub fn version(self, version: &'a str) -> Result<GameVersionBuilder<'a>, DatabaseError> {
|
||||||
if version
|
if version
|
||||||
.chars()
|
.chars()
|
||||||
.all(|c| c.is_ascii_alphanumeric() || "-_.".contains(c))
|
.all(|c| c.is_ascii_alphanumeric() || "-_.".contains(c))
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ macro_rules! generate_ids {
|
|||||||
$vis async fn $function_name(
|
$vis async fn $function_name(
|
||||||
con: &mut sqlx::Transaction<'_, sqlx::Postgres>,
|
con: &mut sqlx::Transaction<'_, sqlx::Postgres>,
|
||||||
) -> Result<$return_type, DatabaseError> {
|
) -> Result<$return_type, DatabaseError> {
|
||||||
use rand::Rng;
|
|
||||||
let mut rng = rand::thread_rng();
|
let mut rng = rand::thread_rng();
|
||||||
let length = $id_length;
|
let length = $id_length;
|
||||||
let mut id = random_base62_rng(&mut rng, length);
|
let mut id = random_base62_rng(&mut rng, length);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
#![allow(unused)]
|
#![allow(dead_code)]
|
||||||
// TODO: remove attr once routes are created
|
// TODO: remove attr once routes are created
|
||||||
|
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
use super::categories::{GameVersion, Loader};
|
|
||||||
use super::ids::*;
|
use super::ids::*;
|
||||||
use super::DatabaseError;
|
use super::DatabaseError;
|
||||||
|
|
||||||
@@ -183,8 +182,6 @@ impl Version {
|
|||||||
where
|
where
|
||||||
E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
|
E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
|
||||||
{
|
{
|
||||||
use sqlx::Done;
|
|
||||||
|
|
||||||
let result = sqlx::query!(
|
let result = sqlx::query!(
|
||||||
"
|
"
|
||||||
SELECT EXISTS(SELECT 1 FROM versions WHERE id = $1)
|
SELECT EXISTS(SELECT 1 FROM versions WHERE id = $1)
|
||||||
@@ -220,7 +217,7 @@ impl Version {
|
|||||||
|
|
||||||
use futures::TryStreamExt;
|
use futures::TryStreamExt;
|
||||||
|
|
||||||
let mut files = sqlx::query!(
|
let files = sqlx::query!(
|
||||||
"
|
"
|
||||||
SELECT files.id, files.url, files.filename FROM files
|
SELECT files.id, files.url, files.filename FROM files
|
||||||
WHERE files.version_id = $1
|
WHERE files.version_id = $1
|
||||||
@@ -434,7 +431,6 @@ impl Version {
|
|||||||
|
|
||||||
if let Some(row) = result {
|
if let Some(row) = result {
|
||||||
use futures::TryStreamExt;
|
use futures::TryStreamExt;
|
||||||
use sqlx::Row;
|
|
||||||
|
|
||||||
let game_versions: Vec<String> = sqlx::query!(
|
let game_versions: Vec<String> = sqlx::query!(
|
||||||
"
|
"
|
||||||
@@ -482,7 +478,7 @@ impl Version {
|
|||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
for file in files.iter_mut() {
|
for file in files.iter_mut() {
|
||||||
let mut files = sqlx::query!(
|
let files = sqlx::query!(
|
||||||
"
|
"
|
||||||
SELECT hashes.algorithm, hashes.hash FROM hashes
|
SELECT hashes.algorithm, hashes.hash FROM hashes
|
||||||
WHERE hashes.file_id = $1
|
WHERE hashes.file_id = $1
|
||||||
|
|||||||
Reference in New Issue
Block a user