Upgrade to rust 1.39.0 (#6939) (#6960)

automerge
2019-11-14 12:55:54 -08:00
parent f895c3f66d
commit d0de05acaa
13 changed files with 36 additions and 11 deletions
--- a/core/src/cluster_info.rs
+++ b/core/src/cluster_info.rs
@@ -986,7 +986,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