Upgrade to Rust 1.42 (#8836) (#8839)

automerge
2020-03-13 14:29:18 -07:00
parent 7722723400
commit d1ec6c0b8b
7 changed files with 9 additions and 7 deletions
--- a/runtime/src/bank.rs
+++ b/runtime/src/bank.rs
@@ -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)
    }

--- a/runtime/src/transaction_batch.rs
+++ b/runtime/src/transaction_batch.rs
@@ -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