From 65041a20bbcdf82ab5f53364460155c7991e5861 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 21 Nov 2022 05:21:09 -0500 Subject: [PATCH] Fix clippy lints. (#2572) * Fix clippy lints. * Fix fmt. * Dont use cargo-workspaces for fix-clippy script. --- crates/api_crud/src/site/update.rs | 2 +- crates/db_schema/src/impls/tagline.rs | 5 ++--- scripts/fix-clippy.sh | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/crates/api_crud/src/site/update.rs b/crates/api_crud/src/site/update.rs index 40a356b6d..632c55f3d 100644 --- a/crates/api_crud/src/site/update.rs +++ b/crates/api_crud/src/site/update.rs @@ -176,7 +176,7 @@ impl PerformCrud for EditSite { .map_err(|e| LemmyError::from_error_message(e, "couldnt_set_all_email_verified"))?; } - let taglines = data.taglines.to_owned(); + let taglines = data.taglines.clone(); Tagline::replace(context.pool(), local_site.id, taglines).await?; let site_view = SiteView::read_local(context.pool()).await?; diff --git a/crates/db_schema/src/impls/tagline.rs b/crates/db_schema/src/impls/tagline.rs index 3696ac577..a41005239 100644 --- a/crates/db_schema/src/impls/tagline.rs +++ b/crates/db_schema/src/impls/tagline.rs @@ -1,7 +1,7 @@ use crate::{ newtypes::LocalSiteId, - schema::tagline::dsl::*, - source::tagline::*, + schema::tagline::dsl::{local_site_id, tagline}, + source::tagline::{Tagline, TaglineForm}, utils::{get_conn, DbPool}, }; use diesel::{insert_into, result::Error, ExpressionMethods, QueryDsl}; @@ -45,7 +45,6 @@ impl Tagline { diesel::delete(tagline).execute(conn).await } pub async fn get_all(pool: &DbPool, for_local_site_id: LocalSiteId) -> Result, Error> { - use crate::schema::tagline::dsl::*; let conn = &mut get_conn(pool).await?; tagline .filter(local_site_id.eq(for_local_site_id)) diff --git a/scripts/fix-clippy.sh b/scripts/fix-clippy.sh index 27b88cedd..3ad68bcd6 100755 --- a/scripts/fix-clippy.sh +++ b/scripts/fix-clippy.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -cargo workspaces exec cargo clippy --fix --allow-dirty --tests --all-targets --all-features -- \ +cargo clippy --workspace --fix --allow-dirty --tests --all-targets --all-features -- \ -D warnings -D deprecated -D clippy::perf -D clippy::complexity \ -D clippy::dbg_macro -D clippy::inefficient_to_string \ -D clippy::items-after-statements -D clippy::implicit_clone \