From e63e838d85eed5147aefcbca81ce18a16cd8fd4b Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Thu, 30 Nov 2017 21:21:39 -0500
Subject: ez: get a little more robust

---
 ez.go | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/ez.go b/ez.go
index eca3494..8fe429d 100644
--- a/ez.go
+++ b/ez.go
@@ -2,6 +2,8 @@ package libfastimport
 
 import (
 	"strconv"
+
+	"github.com/pkg/errors"
 )
 
 type ezfiw struct {
@@ -32,12 +34,18 @@ type ezfir struct {
 	err error
 }
 
+var ezPanic = errors.New("everything is fine")
+
 func (e *ezfir) Defer() error {
-	if r := recover(); r != nil {
-		if e.err != nil {
-			return e.err
+	if e.err != nil {
+		r := recover()
+		if r == nil {
+			panic("ezfir.err got set, but didn't panic")
+		}
+		if r != ezPanic {
+			panic(r)
 		}
-		panic(r)
+		return e.err
 	}
 	return nil
 }
@@ -47,7 +55,7 @@ func (e *ezfir) Errcheck(err error) {
 		return
 	}
 	e.err = err
-	panic("everything is fine")
+	panic(ezPanic)
 }
 
 func (e *ezfir) PeekLine() string {
-- 
cgit v1.2.3