From 383d445ba1175b9bb31408b5c35875121c854b1b Mon Sep 17 00:00:00 2001
From: Greg Fitzgerald <garious@gmail.com>
Date: Thu, 22 Mar 2018 14:15:29 -0600
Subject: [PATCH] Clippy review

---
 src/accountant.rs      | 12 +++---------
 src/accountant_skel.rs | 13 ++++++-------
 src/bin/client-demo.rs |  6 +++---
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/accountant.rs b/src/accountant.rs
index 7f2e65fa9..1e77c26be 100644
--- a/src/accountant.rs
+++ b/src/accountant.rs
@@ -30,13 +30,7 @@ pub type Result<T> = result::Result<T, AccountingError>;
 /// Commit funds to the 'to' party.
 fn complete_transaction(balances: &mut HashMap<PublicKey, i64>, plan: &Plan) {
     if let Plan::Pay(ref payment) = *plan {
-        if balances.contains_key(&payment.to) {
-            if let Some(x) = balances.get_mut(&payment.to) {
-                *x += payment.tokens;
-            }
-        } else {
-            balances.insert(payment.to, payment.tokens);
-        }
+        *balances.entry(payment.to).or_insert(0) += payment.tokens;
     }
 }
 
@@ -176,7 +170,7 @@ impl Accountant {
         for (key, plan) in &mut self.pending {
             plan.apply_witness(Witness::Timestamp(self.last_time));
             if plan.is_complete() {
-                complete_transaction(&mut self.balances, &plan);
+                complete_transaction(&mut self.balances, plan);
                 completed.push(key.clone());
             }
         }
@@ -222,7 +216,7 @@ impl Accountant {
     }
 
     pub fn get_balance(self: &Self, pubkey: &PublicKey) -> Option<i64> {
-        self.balances.get(pubkey).map(|x| *x)
+        self.balances.get(pubkey).cloned()
     }
 }
 
diff --git a/src/accountant_skel.rs b/src/accountant_skel.rs
index dc4dfbc00..a04074083 100644
--- a/src/accountant_skel.rs
+++ b/src/accountant_skel.rs
@@ -108,11 +108,11 @@ impl AccountantSkel {
         {
             let mut num = 0;
             let mut ursps = rsps.write().unwrap();
-            for packet in msgs.read().unwrap().packets.iter() {
+            for packet in &msgs.read().unwrap().packets {
                 let sz = packet.size;
                 let req = deserialize(&packet.data[0..sz])?;
                 if let Some(resp) = self.process_request(req) {
-                    let rsp = ursps.packets.get_mut(num).unwrap();
+                    let rsp = &mut ursps.packets[num];
                     let v = serialize(&resp)?;
                     let len = v.len();
                     rsp.data[0..len].copy_from_slice(&v);
@@ -148,17 +148,16 @@ impl AccountantSkel {
         let t_sender = streamer::sender(write, exit.clone(), recycler.clone(), r_sender);
 
         let t_server = spawn(move || {
-            match Arc::try_unwrap(obj) {
-                Ok(me) => loop {
+            if let Ok(me) = Arc::try_unwrap(obj) {
+                loop {
                     let e = me.lock()
                         .unwrap()
                         .process(&r_reader, &s_sender, recycler.clone());
                     if e.is_err() && exit.load(Ordering::Relaxed) {
                         break;
                     }
-                },
-                _ => (),
-            };
+                }
+            }
         });
         Ok([Arc::new(t_receiver), Arc::new(t_sender), Arc::new(t_server)])
     }
diff --git a/src/bin/client-demo.rs b/src/bin/client-demo.rs
index 18f4e6556..eec97db87 100644
--- a/src/bin/client-demo.rs
+++ b/src/bin/client-demo.rs
@@ -33,7 +33,7 @@ fn main() {
         })
         .collect();
     let duration = now.elapsed();
-    let ns = duration.as_secs() * 1_000_000_000 + duration.subsec_nanos() as u64;
+    let ns = duration.as_secs() * 1_000_000_000 + u64::from(duration.subsec_nanos());
     let bsps = txs as f64 / ns as f64;
     let nsps = ns as f64 / txs as f64;
     println!(
@@ -48,7 +48,7 @@ fn main() {
         assert!(tr.verify());
     }
     let duration = now.elapsed();
-    let ns = duration.as_secs() * 1_000_000_000 + duration.subsec_nanos() as u64;
+    let ns = duration.as_secs() * 1_000_000_000 + u64::from(duration.subsec_nanos());
     let bsvps = txs as f64 / ns as f64;
     let nspsv = ns as f64 / txs as f64;
     println!(
@@ -68,7 +68,7 @@ fn main() {
     acc.wait_on_signature(&sig, &last_id).unwrap();
 
     let duration = now.elapsed();
-    let ns = duration.as_secs() * 1_000_000_000 + duration.subsec_nanos() as u64;
+    let ns = duration.as_secs() * 1_000_000_000 + u64::from(duration.subsec_nanos());
     let tps = (txs * 1_000_000_000) as f64 / ns as f64;
     println!("Done. {} tps!", tps);
     let val = acc.get_balance(&mint_pubkey).unwrap().unwrap();