shithub: hugo

Download patch

ref: b0e21f967b18ab20e0c889228e9caf8dd95723c2
parent: 283b866386c6462c0630e1b6152c28fa83a92d50
author: Bjørn Erik Pedersen <[email protected]>
date: Tue Mar 22 19:53:19 EDT 2016 

helpers: Silence some Golint warnings


--- a/helpers/general.go
+++ b/helpers/general.go
@@ -35,7 +35,7 @@
 	"github.com/spf13/viper"
 )
 
-// Filepath separator defined by os.Separator.
+// FilePathSeparator as defined by os.Separator.
 const FilePathSeparator = string(filepath.Separator)
 
 // FindAvailablePort returns an available and valid TCP port.
@@ -92,7 +92,7 @@
 
 // UniqueStrings returns a new slice with any duplicates removed.
 func UniqueStrings(s []string) []string {
-	unique := make([]string, 0)
+	var unique []string
 	set := map[string]interface{}{}
 	for _, val := range s {
 		if _, ok := set[val]; !ok {
@@ -230,13 +230,13 @@
 	return &DistinctLogger{m: make(map[string]bool), logger: jww.ERROR}
 }
 
-// NewDistinctErrorLogger creates a new DistinctLogger that can be used
+// NewDistinctFeedbackLogger creates a new DistinctLogger that can be used
 // to give feedback to the user while not spamming with duplicates.
 func NewDistinctFeedbackLogger() *DistinctLogger {
 	return &DistinctLogger{m: make(map[string]bool), logger: &jww.FEEDBACK}
 }
 
-// Avoid spamming the logs with errors
+// DistinctErrorLog cann be used to avoid spamming the logs with errors.
 var DistinctErrorLog = NewDistinctErrorLogger()
 
 // Deprecated logs ERROR logs about a deprecation, but only once for a given set of arguments' values.
@@ -430,9 +430,8 @@
 			return af + bf, nil
 		} else if au != 0 || bu != 0 {
 			return au + bu, nil
-		} else {
-			return 0, nil
 		}
+		return 0, nil
 	case '-':
 		if ai != 0 || bi != 0 {
 			return ai - bi, nil
@@ -440,9 +439,8 @@
 			return af - bf, nil
 		} else if au != 0 || bu != 0 {
 			return au - bu, nil
-		} else {
-			return 0, nil
 		}
+		return 0, nil
 	case '*':
 		if ai != 0 || bi != 0 {
 			return ai * bi, nil
@@ -450,9 +448,8 @@
 			return af * bf, nil
 		} else if au != 0 || bu != 0 {
 			return au * bu, nil
-		} else {
-			return 0, nil
 		}
+		return 0, nil
 	case '/':
 		if bi != 0 {
 			return ai / bi, nil
@@ -460,9 +457,8 @@
 			return af / bf, nil
 		} else if bu != 0 {
 			return au / bu, nil
-		} else {
-			return nil, errors.New("Can't divide the value by 0")
 		}
+		return nil, errors.New("Can't divide the value by 0")
 	default:
 		return nil, errors.New("There is no such an operation")
 	}