handle dropped error correctly (#183)

ktr0731 · Jul 25, 2019 · ed4662a · ed4662a
1 parent b6ecb60
commit ed4662a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/...eate_a_default_global_config_if_both_of_global_and_local_config_are_not_found.golden.toml b/...eate_a_default_global_config_if_both_of_global_and_local_config_are_not_found.golden.toml
@@ -10,7 +10,7 @@
 
 [meta]
   autoupdate = false
-  configversion = "0.8.0"
+  configversion = "0.8.1"
   updatelevel = "patch"
 
 [repl]

diff --git a/meta/meta.go b/meta/meta.go
@@ -5,5 +5,5 @@ import version "github.com/hashicorp/go-version"
 const AppName = "evans"
 
 var (
-	Version = version.Must(version.NewSemver("0.8.0"))
+	Version = version.Must(version.NewSemver("0.8.1"))
 )
diff --git a/mode/repl.go b/mode/repl.go
@@ -12,22 +12,19 @@ import (
 	"github.com/ktr0731/evans/prompt"
 	"github.com/ktr0731/evans/repl"
 	"github.com/ktr0731/evans/usecase"
-	"github.com/ktr0731/go-multierror"
 	"github.com/pkg/errors"
 )
 
 func RunAsREPLMode(cfg *config.Config, ui cui.UI, cache *cache.Cache) error {
-	var result error
 	gRPCClient, err := newGRPCClient(cfg)
 	if err != nil {
-		result = multierror.Append(result, err)
-	} else {
-		defer gRPCClient.Close(context.Background())
+		return errors.Wrap(err, "failed to instantiate a new gRPC client")
 	}
+	defer gRPCClient.Close(context.Background())
 
 	spec, err := newSpec(cfg, gRPCClient)
 	if err != nil {
-		result = multierror.Append(result, err)
+		return errors.Wrap(err, "failed to instantiate a new spec")
 	}
 
 	usecase.Inject(
@@ -37,10 +34,6 @@ func RunAsREPLMode(cfg *config.Config, ui cui.UI, cache *cache.Cache) error {
 		json.NewPresenter(),
 	)
 
-	if result != nil {
-		return result
-	}
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()