From 21d80d5f0fd409f2a124aa7694e70789db170777 Mon Sep 17 00:00:00 2001
From: Abhinav Gupta <abg@uber.com>
Date: Fri, 31 Mar 2017 17:44:54 -0700
Subject: [PATCH] Drop var errors error

---
 x/config/configurator.go | 23 ++++++++++-------------
 x/config/spec.go         | 10 +++++-----
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/x/config/configurator.go b/x/config/configurator.go
index 08e61d721..9978e11a4 100644
--- a/x/config/configurator.go
+++ b/x/config/configurator.go
@@ -195,32 +195,29 @@ func (c *Configurator) NewDispatcher(serviceName string, data interface{}) (*yar
 	return yarpc.NewDispatcher(cfg), nil
 }
 
-func (c *Configurator) load(serviceName string, cfg *yarpcConfig) (yarpc.Config, error) {
-	var (
-		errors error
-		b      = newBuilder(serviceName, &Kit{name: serviceName, c: c})
-	)
+func (c *Configurator) load(serviceName string, cfg *yarpcConfig) (_ yarpc.Config, err error) {
+	b := newBuilder(serviceName, &Kit{name: serviceName, c: c})
 
 	for _, inbound := range cfg.Inbounds {
-		if err := c.loadInboundInto(b, inbound); err != nil {
-			errors = multierr.Append(errors, err)
+		if e := c.loadInboundInto(b, inbound); e != nil {
+			err = multierr.Append(err, e)
 		}
 	}
 
 	for name, outboundConfig := range cfg.Outbounds {
-		if err := c.loadOutboundInto(b, name, outboundConfig); err != nil {
-			errors = multierr.Append(errors, err)
+		if e := c.loadOutboundInto(b, name, outboundConfig); e != nil {
+			err = multierr.Append(err, e)
 		}
 	}
 
 	for name, attrs := range cfg.Transports {
-		if err := c.loadTransportInto(b, name, attrs); err != nil {
-			errors = multierr.Append(errors, err)
+		if e := c.loadTransportInto(b, name, attrs); e != nil {
+			err = multierr.Append(err, e)
 		}
 	}
 
-	if errors != nil {
-		return yarpc.Config{}, errors
+	if err != nil {
+		return yarpc.Config{}, err
 	}
 
 	return b.Build()
diff --git a/x/config/spec.go b/x/config/spec.go
index b5793e95e..3e1fdf151 100644
--- a/x/config/spec.go
+++ b/x/config/spec.go
@@ -281,7 +281,7 @@ func (s *compiledTransportSpec) SupportsOnewayOutbound() bool {
 	return s.OnewayOutbound != nil
 }
 
-func compileTransportSpec(spec *TransportSpec) (_ *compiledTransportSpec, err error) {
+func compileTransportSpec(spec *TransportSpec) (*compiledTransportSpec, error) {
 	out := compiledTransportSpec{Name: spec.Name}
 
 	if spec.Name == "" {
@@ -297,11 +297,11 @@ func compileTransportSpec(spec *TransportSpec) (_ *compiledTransportSpec, err er
 		return nil, errors.New("BuildTransport is required")
 	}
 
-	var errors error
+	var err error
 
 	// Helper to chain together the compile calls
-	appendError := func(cs *configSpec, err error) *configSpec {
-		errors = multierr.Append(errors, err)
+	appendError := func(cs *configSpec, e error) *configSpec {
+		err = multierr.Append(err, e)
 		return cs
 	}
 
@@ -315,7 +315,7 @@ func compileTransportSpec(spec *TransportSpec) (_ *compiledTransportSpec, err er
 	if spec.BuildOnewayOutbound != nil {
 		out.OnewayOutbound = appendError(compileOnewayOutboundConfig(spec.BuildOnewayOutbound))
 	}
-	return &out, errors
+	return &out, err
 }
 
 func compileTransportConfig(build interface{}) (*configSpec, error) {