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

Upgrade to Rust 1.42 (#8836)

Browse Source 
* Upgrade to Rust 1.42

* deref

* parens

Co-authored-by: Trent Nelson <trent@solana.com>
This commit is contained in:
Michael Vines
2020-03-13 13:15:22 -07:00
committed by GitHub
parent 52b254071c
commit b7b36bb0a4
7 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/src/bank.rs
View File

@ -1005,7 +1005,7 @@ impl Bank {
let results = self
.rc
.accounts
.lock_accounts(txs, iteration_order.as_ref().map(|v| v.as_slice()));
.lock_accounts(txs, iteration_order.as_deref());
TransactionBatch::new(results, &self, txs, iteration_order)
}

2
runtime/src/transaction_batch.rs
View File

@ -39,7 +39,7 @@ impl<'a, 'b> TransactionBatch<'a, 'b> {
}
pub fn iteration_order(&self) -> Option<&[usize]> {
self.iteration_order.as_ref().map(|v| v.as_slice())
self.iteration_order.as_deref()
}
pub fn bank(&self) -> &Bank {
self.bank