Fix Clippy warnings

Author: erikgrinaker

src/sql/execution/aggregation.rs

@@ -49,11 +49,7 @@ impl<T: Transaction> Executor<T> for Aggregation<T> {
                         .map(|(i, c)| if i < agg_count { Column { name: None } } else { c })
                         .collect(),
                     rows: Box::new(self.accumulators.into_iter().map(|(bucket, accs)| {
-                        Ok(accs
-                            .into_iter()
-                            .map(|acc| acc.aggregate())
-                            .chain(bucket.into_iter())
-                            .collect())
+                        Ok(accs.into_iter().map(|acc| acc.aggregate()).chain(bucket).collect())
                     })),
                 })
             }

src/sql/types/expression.rs

@@ -140,7 +140,7 @@ impl Expression {
                 expr => return Err(Error::Value(format!("Can't take the positive of {}", expr))),
             },
             Self::Divide(lhs, rhs) => match (lhs.evaluate(row)?, rhs.evaluate(row)?) {
-                (Integer(_), Integer(rhs)) if rhs == 0 => {
+                (Integer(_), Integer(0)) => {
                     return Err(Error::Value("Can't divide by zero".into()))
                 }
                 (Integer(lhs), Integer(rhs)) => Integer(lhs / rhs),
@@ -184,7 +184,7 @@ impl Expression {
             },
             Self::Modulo(lhs, rhs) => match (lhs.evaluate(row)?, rhs.evaluate(row)?) {
                 // This uses remainder semantics, like Postgres.
-                (Integer(_), Integer(rhs)) if rhs == 0 => {
+                (Integer(_), Integer(0)) => {
                     return Err(Error::Value("Can't divide by zero".into()))
                 }
                 (Integer(lhs), Integer(rhs)) => Integer(lhs % rhs),

src/storage/mvcc.rs

@@ -1500,7 +1500,7 @@ pub mod tests {
         // Full scans at all timestamps.
         for version in 1..5 {
             let txn = match version {
-                v if v == 5 => mvcc.begin_read_only()?,
+                5 => mvcc.begin_read_only()?,
                 v => mvcc.begin_as_of(v)?,
             };
             let mut scan = txn.scan(..)?; // see golden master
@@ -1555,7 +1555,7 @@ pub mod tests {
         // Full scans at all timestamps.
         for version in 1..5 {
             let txn = match version {
-                v if v == 5 => mvcc.begin_read_only()?,
+                5 => mvcc.begin_read_only()?,
                 v => mvcc.begin_as_of(v)?,
             };
             let mut scan = txn.scan_prefix(&[])?; // see golden master

tests/client/pool.rs

@@ -24,7 +24,7 @@ async fn get() -> Result<()> {
 
     let mut servers = HashSet::new();
     let mut ids = HashSet::new();
-    for client in vec![a, b, c, d, e] {
+    for client in [a, b, c, d, e] {
         servers.insert(client.status().await?.raft.server);
         ids.insert(client.id());
     }