Option improvements

Author: ambaxter

src/bucket.rs

@@ -902,7 +902,7 @@ pub(crate) trait BucketIApi<'tx, T: TxIApi<'tx>>:
 
   /// See [BucketApi::bucket]
   fn api_bucket(self, name: &[u8]) -> Option<Self> {
-    if let Some(w) = self.split_ow().deref() {
+    if let Some(w) = self.split_ow().as_ref() {
       if let Some(child) = w.buckets.get(name) {
         return Some(*child);
       }
@@ -917,7 +917,7 @@ pub(crate) trait BucketIApi<'tx, T: TxIApi<'tx>>:
 
     // Otherwise create a bucket and cache it.
     let child = self.open_bucket(v);
-    if let Some(ref mut w) = self.split_ow_mut().deref_mut() {
+    if let Some(w) = self.split_ow_mut().as_mut() {
       let tx = self.split_bound();
       let bump = tx.bump();
       let name = bump.alloc_slice_copy(name);
@@ -1089,15 +1089,15 @@ pub(crate) trait BucketIApi<'tx, T: TxIApi<'tx>>:
       if id != ZERO_PGID {
         panic!("inline bucket non-zero page access(2): {} != 0", id)
       }
-      return if let Some(root_node) = w.as_ref().map(|wb| wb.root_node).flatten() {
+      return if let Some(root_node) = w.as_ref().and_then(|wb| wb.root_node) {
         PageNode::Node(root_node)
       } else {
         PageNode::Page(r.inline_page.unwrap())
       };
     }
 
     // Check the node cache for non-inline buckets.
-    if let Some(wb) = w.deref() {
+    if let Some(wb) = w.as_ref() {
       if let Some(node) = wb.nodes.get(&id) {
         return PageNode::Node(*node);
       }

src/tx.rs

@@ -766,7 +766,7 @@ pub(crate) trait TxIApi<'tx>: SplitRef<TxR<'tx>, Self::BucketType, TxW<'tx>> {
   }
 
   fn any_page<'a>(&'a self, id: PgId) -> AnyPage<'a, 'tx> {
-    if let Some(ref tx) = self.split_ow().deref() {
+    if let Some(tx) = self.split_ow().as_ref() {
       if let Some(page) = tx.pages.get(&id).map(|p| p.as_ref()) {
         page.fast_check(id);
         return AnyPage::Pending(*page);
@@ -850,7 +850,7 @@ pub(crate) trait TxIApi<'tx>: SplitRef<TxR<'tx>, Self::BucketType, TxW<'tx>> {
   }
 
   fn rollback(self) -> crate::Result<()> {
-    if let Some(mut w) = self.split_ow_mut().as_mut() {
+    if let Some(w) = self.split_ow_mut().as_mut() {
       w.tx_closing_state = TxClosingState::ExplicitRollback;
     }
     Ok(())