Upgrade to Rust 1.31.0 (#2052)

* Upgrade to Rust 1.31.0
* Upgrade nightly
* Fix all clippy warnings
* Revert relaxed version check and update

tests/data_replicator.rs

@@ -184,7 +184,8 @@ pub fn cluster_info_retransmit() -> result::Result<()> {
             s.set_read_timeout(Some(Duration::new(1, 0))).unwrap();
             let res = s.recv_from(&mut b.data);
             res.is_err() //true if failed to receive the retransmit packet
-        }).collect();
+        })
+        .collect();
     //true if failed receive the retransmit packet, r2, and r3 should succeed
     //r1 was the sender, so it should fail to receive the packet
     assert_eq!(res, [true, false, false]);

tests/multinode.rs

@@ -652,14 +652,16 @@ fn test_multi_node_dynamic_network() {
         &alice_arc.read().unwrap(),
         &bob_pubkey,
         Some(500),
-    ).unwrap();
+    )
+    .unwrap();
     assert_eq!(leader_balance, 500);
     let leader_balance = retry_send_tx_and_retry_get_balance(
         &leader_data,
         &alice_arc.read().unwrap(),
         &bob_pubkey,
         Some(1000),
-    ).unwrap();
+    )
+    .unwrap();
     assert_eq!(leader_balance, 1000);
 
     let t1: Vec<_> = (0..num_nodes)
@@ -670,8 +672,10 @@ fn test_multi_node_dynamic_network() {
                 .spawn(move || {
                     info!("Spawned thread {}", n);
                     Keypair::new()
-                }).unwrap()
-        }).collect();
+                })
+                .unwrap()
+        })
+        .collect();
 
     info!("Waiting for keypairs to be created");
     let keypairs: Vec<_> = t1.into_iter().map(|t| t.join().unwrap()).collect();
@@ -710,8 +714,10 @@ fn test_multi_node_dynamic_network() {
                         None,
                     );
                     (rd, val)
-                }).unwrap()
-        }).collect();
+                })
+                .unwrap()
+        })
+        .collect();
 
     let mut validators: Vec<_> = t2.into_iter().map(|t| t.join().unwrap()).collect();
 
@@ -731,7 +737,8 @@ fn test_multi_node_dynamic_network() {
                 &alice_arc.read().unwrap().keypair(),
                 bob_pubkey,
                 &last_id,
-            ).unwrap();
+            )
+            .unwrap();
 
         expected_balance += 500;
 
@@ -1101,7 +1108,8 @@ fn run_node(
                 };
             }
             sleep(Duration::new(1, 0));
-        }).unwrap()
+        })
+        .unwrap()
 }
 
 #[test]
@@ -1487,7 +1495,8 @@ fn test_full_leader_validator_network() {
             .filter_map(|(i, x)| match empty_iterators.get(&i) {
                 None => Some(x),
                 _ => None,
-            }).collect();
+            })
+            .collect();
 
         if node_entries.len() == 0 {
             break;
@@ -1545,7 +1554,8 @@ fn test_broadcast_last_tick() {
                 Arc::new(node.sockets.replicate.pop().unwrap()),
                 blob_receiver_exit.clone(),
             )
-        }).collect();
+        })
+        .collect();
 
     // Create fullnode, should take 20 seconds to reach end of bootstrap period
     let bootstrap_height = (NUM_TICKS_PER_SECOND * 20) as u64;

tests/programs.rs

@@ -213,7 +213,8 @@ fn test_program_lua_move_funds() {
             local tokens, _ = string.unpack("I", data)
             accounts[1].tokens = accounts[1].tokens - tokens
             accounts[2].tokens = accounts[2].tokens + tokens
-        "#.as_bytes()
+        "#
+    .as_bytes()
     .to_vec();
     let program = Program::new(&loader, &userdata);
     let from = Keypair::new();

tests/replicator.rs

@@ -69,7 +69,8 @@ fn test_replicator_startup() {
             replicator_node,
             &leader_info,
             &replicator_keypair,
-        ).unwrap();
+        )
+        .unwrap();
 
         let mut num_entries = 0;
         for _ in 0..60 {