More cleaning

solana-labs · Oct 15, 2020 · 74a3b4a · 74a3b4a
1 parent f5a4949
commit 74a3b4a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs
@@ -1316,9 +1316,12 @@ impl AccountsDB {
         let (slot, store_id, offset) = {
             let (lock, index) = accounts_index.get(pubkey, Some(ancestors), None)?;
             let slot_list = lock.slot_list();
-            let slot = slot_list[index].0;
-            let store_id = slot_list[index].1.store_id;
-            let offset = slot_list[index].1.offset;
+            let (
+                slot,
+                AccountInfo {
+                    store_id, offset, ..
+                },
+            ) = slot_list[index];
             (slot, store_id, offset)
             // `lock` released here
         };
@@ -1342,9 +1345,12 @@ impl AccountsDB {
                 .get(pubkey, Some(ancestors), None)
                 .unwrap();
             let slot_list = lock.slot_list();
-            let slot = slot_list[index].0;
-            let store_id = slot_list[index].1.store_id;
-            let offset = slot_list[index].1.offset;
+            let (
+                slot,
+                AccountInfo {
+                    store_id, offset, ..
+                },
+            ) = slot_list[index];
             (slot, store_id, offset)
             // lock released here
         };

diff --git a/runtime/src/accounts_index.rs b/runtime/src/accounts_index.rs
@@ -13,10 +13,7 @@ use std::{
 const ITER_BATCH_SIZE: usize = 1000;
 
 #[self_referencing]
-pub struct OwningReadGuard<T>
-where
-    T: 'static,
-{
+pub struct OwningReadGuard<T: 'static> {
     lock: Arc<RwLock<T>>,
     #[borrows(lock)]
     pub guard: RwLockReadGuard<'this, T>,
@@ -30,10 +27,7 @@ impl<T> Deref for OwningReadGuard<T> {
 }
 
 #[self_referencing]
-pub struct OwningWriteGuard<T>
-where
-    T: 'static,
-{
+pub struct OwningWriteGuard<T: 'static> {
     lock: Arc<RwLock<T>>,
     #[borrows(lock)]
     pub guard: RwLockWriteGuard<'this, T>,