gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
automerge
This commit is contained in:
mergify[bot]
2019-11-14 12:55:54 -08:00
committed by Grimes
parent f895c3f66d
commit d0de05acaa
13 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/src/accounts.rs
View File

@@ -310,7 +310,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));
});

4
runtime/src/storage_utils.rs
View File

@@ -62,7 +62,7 @@ pub fn validator_accounts(bank: &Bank) -> HashMap<Pubkey, Account> {
.iter()
.filter_map(|account_id| {
bank.get_account(account_id)
.and_then(|account| Some((*account_id, account)))
.map(|account| (*account_id, account))
})
.collect()
}
@@ -73,7 +73,7 @@ pub fn archiver_accounts(bank: &Bank) -> HashMap<Pubkey, Account> {
.iter()
.filter_map(|account_id| {
bank.get_account(account_id)
.and_then(|account| Some((*account_id, account)))
.map(|account| (*account_id, account))
})
.collect()
}