Compare commits

...
Author SHA1 Message Date
salt d39962491f fix some warnings (mostly unnecessary mut) 2023-12-07 18:36:51 -08:00
14 changed files with 20 additions and 20 deletions
@@ -27,7 +27,7 @@ pub async fn search_tts_models(
let mut response_json = search_response.json::<Value>().await?;
let mut hits = response_json.get_mut("hits")
let hits = response_json.get_mut("hits")
.map(|hits| hits.take());
let hits = hits.map(|mut hits| {
@@ -167,7 +167,7 @@ FROM email_sender_jobs"#.to_string();
LIMIT ?
"#);
let mut query = sqlx::query_as::<_, AvailableEmailSenderJobRawInternal>(&query)
let query = sqlx::query_as::<_, AvailableEmailSenderJobRawInternal>(&query)
.bind(args.is_debug_worker)
.bind(args.num_records);
@@ -336,7 +336,7 @@ FROM generic_inference_jobs"#.to_string();
LIMIT ?
"#);
let mut query = sqlx::query_as::<_, AvailableInferenceJobRawInternal>(&query)
let query = sqlx::query_as::<_, AvailableInferenceJobRawInternal>(&query)
.bind(args.is_debug_worker)
.bind(args.num_records);
@@ -20,7 +20,7 @@ pub async fn mark_generic_inference_job_failure(
// statuses: "attempt_failed", "complete_failure", "dead"
let mut next_status = "attempt_failed";
let mut maybe_public_failure_reason = maybe_public_failure_reason.map(|reason| {
let maybe_public_failure_reason = maybe_public_failure_reason.map(|reason| {
let mut reason = reason.trim().to_string();
reason.truncate(512); // Max length of column is 512
reason
@@ -14,7 +14,7 @@ pub struct UpdateMediaFileArgs<'a> {
pub async fn update_media_file(args: UpdateMediaFileArgs<'_>) -> AnyhowResult<()>{
// TODO: enforce checks for idempotency token
let mut transaction = args.mysql_pool.begin().await?;
let transaction = args.mysql_pool.begin().await?;
let query_result = sqlx::query!(
r#"
UPDATE media_files
@@ -184,7 +184,7 @@ impl ListCategoriesQueryBuilder {
query = query.bind(model_type);
}
let mut results = query.fetch_all(&mut **mysql_connection)
let results = query.fetch_all(&mut **mysql_connection)
.await?;
Ok(results)
@@ -239,7 +239,7 @@ LEFT OUTER JOIN users
let mut query = "".to_string();
if let Some(username) = self.scope_creator_user_token.as_deref() {
if let Some(_username) = self.scope_creator_user_token.as_deref() {
if !first_predicate_added {
query.push_str(" WHERE model_categories.creator_user_token = ?");
first_predicate_added = true;
@@ -248,7 +248,7 @@ LEFT OUTER JOIN users
}
}
if let Some(model_type) = self.scope_model_type.as_deref() {
if let Some(_model_type) = self.scope_model_type.as_deref() {
if !first_predicate_added {
query.push_str(" WHERE model_categories.model_type = ?");
first_predicate_added = true;
@@ -16,7 +16,7 @@ pub struct UpdateWeightArgs<'a> {
}
pub async fn update_weights(args: UpdateWeightArgs<'_>) -> AnyhowResult<()> {
let mut transaction = args.mysql_pool.begin().await?;
let transaction = args.mysql_pool.begin().await?;
let query_result = sqlx
::query!(
@@ -63,7 +63,7 @@ pub async fn list_trending_tts_models(
];
let query = query_parts.join(" UNION ");
let mut query = sqlx::query_as::<_, RawTrendingModel>(&query);
let query = sqlx::query_as::<_, RawTrendingModel>(&query);
let results = query.fetch_all(&mut **mysql_connection).await?;
@@ -159,7 +159,7 @@ impl ListAssignedTtsCategoriesQueryBuilder {
// NB: Model token is always used for scoping.
query = query.bind(&self.scope_tts_model_token);
let mut results = query.fetch_all(&mut **mysql_connection)
let results = query.fetch_all(&mut **mysql_connection)
.await?;
Ok(results)
@@ -192,7 +192,7 @@ pub async fn mark_tts_upload_job_done(
{
let status = if success { "complete_success" } else { "complete_failure" };
let query_result = sqlx::query!(
let _query_result = sqlx::query!(
r#"
UPDATE tts_model_upload_jobs
SET
@@ -268,7 +268,7 @@ LEFT OUTER JOIN users
}
}
if let Some(username) = self.scope_creator_username.as_deref() {
if let Some(_username) = self.scope_creator_username.as_deref() {
if !first_predicate_added {
query.push_str(" WHERE users.username = ?");
first_predicate_added = true;
@@ -93,7 +93,7 @@ SET
"#, query_inner_positions, query_inner_ip_addresses, user_token, rule_tokens);
// NB: This, unfortunately, cannot be statically checked.
let mut query = sqlx::query(&query);
let query = sqlx::query(&query);
let result = query.execute(mysql_pool).await;
@@ -145,7 +145,7 @@ impl TwitchOauthTokenFinder {
query = query.bind(twitch_username);
}
let mut result = query.fetch_optional(mysql_pool).await;
let result = query.fetch_optional(mysql_pool).await;
match result {
Ok(Some(record)) => {
@@ -65,10 +65,10 @@ impl ListUsersQueryBuilder {
let internal_results = self.internal_query(mysql_pool).await?;
let mut first_id = internal_results.first()
let first_id = internal_results.first()
.map(|raw_result| raw_result.user_id);
let mut last_id = internal_results.last()
let last_id = internal_results.last()
.map(|raw_result| raw_result.user_id);
let users = internal_results
@@ -106,17 +106,17 @@ impl ListUsersQueryBuilder {
) -> AnyhowResult<Vec<UserForListRaw>> {
let query = self.build_query_string();
let mut query = sqlx::query_as::<_, UserForListRaw>(&query);
let query = sqlx::query_as::<_, UserForListRaw>(&query);
let mut results = query.fetch_all(mysql_pool)
let results = query.fetch_all(mysql_pool)
.await?;
Ok(results)
}
pub fn build_query_string(&self) -> String {
let mut query_string = r#"
let query_string = r#"
SELECT
id as user_id,
token as user_token,