Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix clippy lints, 0.7 branch #3527

Merged
merged 1 commit into from
Dec 2, 2024
Merged

Fix clippy lints, 0.7 branch #3527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions aggregator_core/src/datastore/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand All @@ -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,
);
)
}
}

Expand Down
2 changes: 1 addition & 1 deletion integration_tests/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ pub enum ClientBackend<'a> {
},
}

impl<'a> ClientBackend<'a> {
impl ClientBackend<'_> {
pub async fn build<V>(
&self,
test_name: &str,
Expand Down
2 changes: 1 addition & 1 deletion integration_tests/tests/integration/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ where
aggregate_result: V::AggregateResult,
}

pub async fn collect_generic<'a, V, Q>(
pub async fn collect_generic<V, Q>(
collector: &Collector<V>,
query: Query<Q>,
aggregation_parameter: &V::AggregationParam,
Expand Down
Loading