From b573595bb8671372aab762d2557b5683e03130dd Mon Sep 17 00:00:00 2001 From: David Cook Date: Mon, 2 Dec 2024 11:06:49 -0600 Subject: [PATCH] Fix clippy lints --- aggregator_core/src/datastore/tests.rs | 8 ++++---- integration_tests/src/client.rs | 2 +- integration_tests/tests/integration/common.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/aggregator_core/src/datastore/tests.rs b/aggregator_core/src/datastore/tests.rs index 7db73ca04..17f1f6e94 100644 --- a/aggregator_core/src/datastore/tests.rs +++ b/aggregator_core/src/datastore/tests.rs @@ -6204,14 +6204,14 @@ async fn delete_expired_collection_artifacts(ephemeral_datastore: EphemeralDatas Q::write_outstanding_batch(tx, task.id(), &batch_identifier, &time_bucket_start) .await; - return ( + ( Some(*collection_job.id()), None, Some((*task.id(), batch_identifier.get_encoded().unwrap())), outstanding_batch_id, Some((*task.id(), batch_identifier.get_encoded().unwrap())), time_bucket_start, - ); + ) } else { tx.put_aggregate_share_job::<0, Q, dummy::Vdaf>(&AggregateShareJob::new( *task.id(), @@ -6224,14 +6224,14 @@ async fn delete_expired_collection_artifacts(ephemeral_datastore: EphemeralDatas .await .unwrap(); - return ( + ( None, Some((*task.id(), batch_identifier.get_encoded().unwrap())), Some((*task.id(), batch_identifier.get_encoded().unwrap())), None, Some((*task.id(), batch_identifier.get_encoded().unwrap())), None, - ); + ) } } diff --git a/integration_tests/src/client.rs b/integration_tests/src/client.rs index c3d3c87af..660374de0 100644 --- a/integration_tests/src/client.rs +++ b/integration_tests/src/client.rs @@ -196,7 +196,7 @@ pub enum ClientBackend<'a> { }, } -impl<'a> ClientBackend<'a> { +impl ClientBackend<'_> { pub async fn build( &self, test_name: &str, diff --git a/integration_tests/tests/integration/common.rs b/integration_tests/tests/integration/common.rs index 2b10e60ca..ceac15850 100644 --- a/integration_tests/tests/integration/common.rs +++ b/integration_tests/tests/integration/common.rs @@ -129,7 +129,7 @@ where aggregate_result: V::AggregateResult, } -pub async fn collect_generic<'a, V, Q>( +pub async fn collect_generic( collector: &Collector, query: Query, aggregation_parameter: &V::AggregationParam,