From eb761bbdcf7798741b42bfd8edc49bdb00f6298b Mon Sep 17 00:00:00 2001 From: phiresky Date: Tue, 22 Aug 2023 14:59:49 +0000 Subject: [PATCH] fix lint --- crates/db_schema/src/source/activity.rs | 5 ++--- crates/federate/src/lib.rs | 6 +++--- crates/federate/src/util.rs | 4 +++- crates/federate/src/worker.rs | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/crates/db_schema/src/source/activity.rs b/crates/db_schema/src/source/activity.rs index f2a4058c0..dcebbacb1 100644 --- a/crates/db_schema/src/source/activity.rs +++ b/crates/db_schema/src/source/activity.rs @@ -3,15 +3,14 @@ use crate::{ schema::sent_activity, }; use diesel::{ - backend::Backend, deserialize::FromSql, pg::{Pg, PgValue}, serialize::{Output, ToSql}, - sql_types::{Array, Jsonb, Nullable}, + sql_types::{Jsonb, Nullable}, Queryable, }; use serde_json::Value; -use std::{collections::HashSet, fmt::Debug, hash::Hash, io::Write}; +use std::{collections::HashSet, fmt::Debug, io::Write}; use url::Url; #[derive( diff --git a/crates/federate/src/lib.rs b/crates/federate/src/lib.rs index 97620100a..5d5b2617f 100644 --- a/crates/federate/src/lib.rs +++ b/crates/federate/src/lib.rs @@ -149,9 +149,9 @@ async fn receive_print_stats( async fn print_stats(pool: &mut DbPool<'_>, stats: &HashMap) { let last_id = crate::util::get_latest_activity_id(pool).await; let Ok(last_id) = last_id else { - tracing::error!("could not get last id"); - return; - }; + tracing::error!("could not get last id"); + return; + }; // it's expected that the values are a bit out of date, everything < SAVE_STATE_EVERY should be considered up to date tracing::info!( "Federation state as of {}:", diff --git a/crates/federate/src/util.rs b/crates/federate/src/util.rs index bf6a436bb..5b007cb14 100644 --- a/crates/federate/src/util.rs +++ b/crates/federate/src/util.rs @@ -130,7 +130,9 @@ pub(crate) async fn get_activity_cached( .await .optional() .context("could not read activity")?; - let Some(mut row) = row else { return anyhow::Result::<_, anyhow::Error>::Ok(None) }; + let Some(mut row) = row else { + return anyhow::Result::<_, anyhow::Error>::Ok(None); + }; // swap to avoid cloning let mut data = Value::Null; std::mem::swap(&mut row.data, &mut data); diff --git a/crates/federate/src/worker.rs b/crates/federate/src/worker.rs index f8aa47ce7..76236f761 100644 --- a/crates/federate/src/worker.rs +++ b/crates/federate/src/worker.rs @@ -210,7 +210,7 @@ impl InstanceWorker { activity .send_inboxes .iter() - .filter_map(|e| e.as_ref()) + .filter_map(std::option::Option::as_ref) .filter_map(|u| (u.domain() == Some(&self.instance.domain)).then(|| u.inner().clone())), ); inbox_urls