remove redundant else blocks

golint asks to remove else blocks when returning to improve readability.

Author: codyoss

builder.go

@@ -22,9 +22,8 @@ func NewErrorBuilder(t *Type) *ErrorBuilder {
 	getMode := func() callStackBuildMode {
 		if t.modifiers.CollectStackTrace() {
 			return stackTraceCollect
-		} else {
-			return stackTraceOmit
 		}
+		return stackTraceOmit
 	}
 
 	return &ErrorBuilder{
@@ -136,9 +135,8 @@ func (eb *ErrorBuilder) borrowStackTraceFromCause() *stackTrace {
 	originalStackTrace := eb.extractStackTraceFromCause(eb.cause)
 	if originalStackTrace != nil {
 		return originalStackTrace
-	} else {
-		return collectStackTrace()
 	}
+	return collectStackTrace()
 }
 
 func (eb *ErrorBuilder) combineStackTraceWithCause() *stackTrace {

error.go

@@ -173,9 +173,8 @@ func (e *Error) Error() string {
 func (e *Error) fullMessage() string {
 	if e.transparent {
 		return e.messageWithUnderlyingInfo()
-	} else {
-		return joinStringsIfNonEmpty(": ", e.errorType.FullName(), e.messageWithUnderlyingInfo())
 	}
+	return joinStringsIfNonEmpty(": ", e.errorType.FullName(), e.messageWithUnderlyingInfo())
 }
 
 func (e *Error) messageWithUnderlyingInfo() string {

namespace.go

@@ -105,17 +105,15 @@ func newNamespace(parent *Namespace, name string, traits ...Trait) Namespace {
 	createName := func() string {
 		if parent == nil {
 			return name
-		} else {
-			return fmt.Sprintf("%s.%s", parent.FullName(), name)
 		}
+		return fmt.Sprintf("%s.%s", parent.FullName(), name)
 	}
 
 	createModifiers := func() modifiers {
 		if parent == nil {
 			return noModifiers{}
-		} else {
-			return newInheritedModifiers(parent.modifiers)
 		}
+		return newInheritedModifiers(parent.modifiers)
 	}
 
 	namespace := Namespace{

type.go

@@ -123,9 +123,8 @@ func newType(namespace Namespace, parent *Type, name string, traits ...Trait) *T
 	collectModifiers := func() modifiers {
 		if parent == nil {
 			return newInheritedModifiers(namespace.modifiers)
-		} else {
-			return newInheritedModifiers(parent.modifiers)
 		}
+		return newInheritedModifiers(parent.modifiers)
 	}
 
 	collectTraits := func() map[Trait]bool {
@@ -150,9 +149,8 @@ func newType(namespace Namespace, parent *Type, name string, traits ...Trait) *T
 	createFullName := func() string {
 		if parent == nil {
 			return namespace.FullName() + "." + name
-		} else {
-			return parent.FullName() + "." + name
 		}
+		return parent.FullName() + "." + name
 	}
 
 	t := &Type{

wrap.go

@@ -67,9 +67,8 @@ func DecorateMany(message string, errs ...error) error {
 
 	if areAllOfTheSameType(errs...) {
 		return WrapMany(transparentWrapper, message, errs...)
-	} else {
-		return WrapMany(opaqueWrapper, message, errs...)
 	}
+	return WrapMany(opaqueWrapper, message, errs...)
 }
 
 // WrapMany is a utility to wrap multiple errors.
@@ -110,9 +109,8 @@ func areAllOfTheSameType(errs ...error) bool {
 
 		if errorType != nil && errorType != typedError.Type() {
 			return false
-		} else {
-			errorType = typedError.Type()
 		}
+		errorType = typedError.Type()
 	}
 
 	return true