From 95314d0f698dce15351107749517b85d4fefe4c5 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@electriccoin.co>
Date: Thu, 14 Jan 2021 13:20:54 +0000
Subject: [PATCH] clippy: Add type definitions for complex types

---
 src/plonk/lookup/prover.rs | 10 +++-------
 src/poly/multiopen.rs      |  9 ++++++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/plonk/lookup/prover.rs b/src/plonk/lookup/prover.rs
index f13bcdb..9025cc3 100644
--- a/src/plonk/lookup/prover.rs
+++ b/src/plonk/lookup/prover.rs
@@ -506,6 +506,8 @@ impl<C: CurveAffine> Evaluated<C> {
     }
 }
 
+type ColumnPair<F> = (Polynomial<F, LagrangeCoeff>, Polynomial<F, LagrangeCoeff>);
+
 /// Given a column of input values A and a column of table values S,
 /// this method permutes A and S to produce A' and S', such that:
 /// - like values in A' are vertically adjacent to each other; and
@@ -516,13 +518,7 @@ fn permute_column_pair<C: CurveAffine>(
     domain: &EvaluationDomain<C::Scalar>,
     input_column: &Polynomial<C::Scalar, LagrangeCoeff>,
     table_column: &Polynomial<C::Scalar, LagrangeCoeff>,
-) -> Result<
-    (
-        Polynomial<C::Scalar, LagrangeCoeff>,
-        Polynomial<C::Scalar, LagrangeCoeff>,
-    ),
-    Error,
-> {
+) -> Result<ColumnPair<C::Scalar>, Error> {
     let mut permuted_input_column = input_column.clone();
 
     // Sort input lookup column values
diff --git a/src/poly/multiopen.rs b/src/poly/multiopen.rs
index a8880e7..98fd746 100644
--- a/src/poly/multiopen.rs
+++ b/src/poly/multiopen.rs
@@ -87,9 +87,12 @@ trait Query<F>: Sized {
     fn get_commitment(&self) -> Self::Commitment;
 }
 
-fn construct_intermediate_sets<F: FieldExt, I, Q: Query<F>>(
-    queries: I,
-) -> (Vec<CommitmentData<Q::Eval, Q::Commitment>>, Vec<Vec<F>>)
+type IntermediateSets<F, Q> = (
+    Vec<CommitmentData<<Q as Query<F>>::Eval, <Q as Query<F>>::Commitment>>,
+    Vec<Vec<F>>,
+);
+
+fn construct_intermediate_sets<F: FieldExt, I, Q: Query<F>>(queries: I) -> IntermediateSets<F, Q>
 where
     I: IntoIterator<Item = Q> + Clone,
 {