Upgrade to rust 1.39.0 (#6939)

* Upgrade to rust 1.39.0 * 1.39.0 clippy
2019-11-14 12:27:01 -07:00
parent f108f483b7
commit e7f63cd336
13 changed files with 36 additions and 11 deletions
--- a/core/src/cluster_info.rs
+++ b/core/src/cluster_info.rs
@ -990,7 +990,7 @@ impl ClusterInfo {
    fn gossip_request(&mut self, stakes: &HashMap<Pubkey, u64>) -> Vec<(SocketAddr, Protocol)> {
        let pulls: Vec<_> = self.new_pull_requests(stakes);
        let pushes: Vec<_> = self.new_push_requests();
-        vec![pulls, pushes].into_iter().flat_map(|x| x).collect()
+        vec![pulls, pushes].into_iter().flatten().collect()
    }

    /// At random pick a node and try to get updated changes from them