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/runtime/src/accounts.rs
+++ b/runtime/src/accounts.rs
@@ -300,7 +300,7 @@ impl Accounts {
            },
        );

-        let mut versions: Vec<(Pubkey, u64, B)> = accumulator.into_iter().flat_map(|x| x).collect();
+        let mut versions: Vec<(Pubkey, u64, B)> = accumulator.into_iter().flatten().collect();
        self.accounts_db.thread_pool.install(|| {
            versions.par_sort_by_key(|s| (s.0, s.1));
        });