From 8ef7b4e0c67560bc8d10a78a6c55d0631128504f Mon Sep 17 00:00:00 2001
From: John Sirois <john.sirois@gmail.com>
Date: Thu, 14 Jul 2016 20:37:13 -0600
Subject: [PATCH] Cleanup `HookError` tracing logic.

Use `Result::or_else` instead of matching and no-oping the `Ok` case
manually and extract a helper to centralize repeated trace logic.
---
 libimagstore/src/hook/aspect.rs | 54 +++++++++------------------------
 1 file changed, 15 insertions(+), 39 deletions(-)

diff --git a/libimagstore/src/hook/aspect.rs b/libimagstore/src/hook/aspect.rs
index bfbd5187..71ebd4f7 100644
--- a/libimagstore/src/hook/aspect.rs
+++ b/libimagstore/src/hook/aspect.rs
@@ -51,19 +51,7 @@ impl StoreIdAccessor for Aspect {
                 &HDA::StoreIdAccess(accessor) => accessor.access(id),
                 _ => unreachable!(),
             };
-
-            match res {
-                Ok(res) => Ok(res),
-                Err(e) => {
-                    if !e.is_aborting() {
-                        trace_error(&e);
-                        // ignore error if it is not aborting, as we printed it already
-                        Ok(())
-                    } else {
-                        Err(e)
-                    }
-                }
-            }
+            trace_hook_errors(res)
         })
     }
 }
@@ -94,19 +82,7 @@ impl MutableHookDataAccessor for Aspect {
                 &HDA::NonMutableAccess(ref accessor) => accessor.access(fle),
                 _ => unreachable!(),
             };
-
-            match res {
-                Ok(res) => Ok(res),
-                Err(e) => {
-                    if !e.is_aborting() {
-                        trace_error(&e);
-                        // ignore error if it is not aborting, as we printed it already
-                        Ok(())
-                    } else {
-                        Err(e)
-                    }
-                }
-            }
+            trace_hook_errors(res)
         })
     }
 }
@@ -123,20 +99,20 @@ impl NonMutableHookDataAccessor for Aspect {
                 &HDA::NonMutableAccess(accessor) => accessor.access(fle),
                 _ => unreachable!(),
             };
-
-            match res {
-                Ok(res) => Ok(res),
-                Err(e) => {
-                    if !e.is_aborting() {
-                        trace_error(&e);
-                        // ignore error if it is not aborting, as we printed it already
-                        Ok(())
-                    } else {
-                        Err(e)
-                    }
-                }
-            }
+            trace_hook_errors(res)
         })
     }
 }
 
+fn trace_hook_errors(res: HookResult<()>) -> HookResult<()> {
+    res.or_else(|e| {
+        if !e.is_aborting() {
+            trace_error(&e);
+            // ignore error if it is not aborting, as we printed it already
+            Ok(())
+        } else {
+            Err(e)
+        }
+    })
+}
+