ref: 772128485a7e94932cd18b5e3a78d8cfb273e797
parent: c2c4cb1f9f9ea9f05a9c9cf7123a17660208cad4
author: Bjørn Erik Pedersen <[email protected]>
date: Wed Feb 21 04:23:43 EST 2018
Run gofmt -s with Go 1.10 See #4434
--- a/commands/server.go
+++ b/commands/server.go
@@ -359,7 +359,7 @@
var sigs = make(chan os.Signal)
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
- for i, _ := range baseURLs {+ for i := range baseURLs {mu, serverURL, endpoint, err := srv.createEndpoint(i)
if doLiveReload {--- a/helpers/path_test.go
+++ b/helpers/path_test.go
@@ -670,10 +670,10 @@
//cwd, _ := os.Getwd()
data := []test{- //{cwd, nil},- // Commenting this out. It doesn't work properly.
- // There's a good reason why we don't use os.Getwd(), it doesn't actually work the way we want it to.
- // I really don't know a better way to test this function. - SPF 2014.11.04
+ //{cwd, nil},+ // Commenting this out. It doesn't work properly.
+ // There's a good reason why we don't use os.Getwd(), it doesn't actually work the way we want it to.
+ // I really don't know a better way to test this function. - SPF 2014.11.04
}
for i, d := range data {dir, err := FindCWD()
--- a/helpers/processing_stats.go
+++ b/helpers/processing_stats.go
@@ -41,14 +41,14 @@
func (s *ProcessingStats) toVals() []processingStatsTitleVal { return []processingStatsTitleVal{- processingStatsTitleVal{"Pages", s.Pages},- processingStatsTitleVal{"Paginator pages", s.PaginatorPages},- processingStatsTitleVal{"Non-page files", s.Files},- processingStatsTitleVal{"Static files", s.Static},- processingStatsTitleVal{"Processed images", s.ProcessedImages},- processingStatsTitleVal{"Aliases", s.Aliases},- processingStatsTitleVal{"Sitemaps", s.Sitemaps},- processingStatsTitleVal{"Cleaned", s.Cleaned},+ {"Pages", s.Pages},+ {"Paginator pages", s.PaginatorPages},+ {"Non-page files", s.Files},+ {"Static files", s.Static},+ {"Processed images", s.ProcessedImages},+ {"Aliases", s.Aliases},+ {"Sitemaps", s.Sitemaps},+ {"Cleaned", s.Cleaned},}
}
--- a/hugolib/hugo_sites.go
+++ b/hugolib/hugo_sites.go
@@ -739,7 +739,7 @@
}
dirs := make([]string, len(mm))
i := 0
- for dir, _ := range mm {+ for dir := range mm {dirs[i] = dir
i++
}
--- a/magefile.go
+++ b/magefile.go
@@ -122,7 +122,7 @@
// Run gofmt linter
func Fmt() error {- if isGoTip() {+ if !isGoLatest() {return nil
}
pkgs, err := hugoPackages()
@@ -258,6 +258,6 @@
return nil
}
-func isGoTip() bool {- return strings.Contains(runtime.Version(), "devel") || strings.Contains(runtime.Version(), "1.10")
+func isGoLatest() bool {+ return strings.Contains(runtime.Version(), "1.10")
}
--- a/resource/image_cache.go
+++ b/resource/image_cache.go
@@ -42,7 +42,7 @@
func (c *imageCache) deleteByPrefix(prefix string) {c.mu.Lock()
defer c.mu.Unlock()
- for k, _ := range c.store {+ for k := range c.store { if strings.HasPrefix(k, prefix) {delete(c.store, k)
}
--- a/resource/image_test.go
+++ b/resource/image_test.go
@@ -244,7 +244,7 @@
image := fetchSunset(assert)
var meta = []map[string]interface{}{- map[string]interface{}{+ {"title": "My Sunset",
"name": "Sunset #:counter",
"src": "*.jpg",
--- a/resource/resource.go
+++ b/resource/resource.go
@@ -332,7 +332,7 @@
s := fmt.Sprintf("Cache entries: %d", len(r.imageCache.store))count := 0
- for k, _ := range r.imageCache.store {+ for k := range r.imageCache.store { if count > 5 {break
}
--- a/resource/resource_test.go
+++ b/resource/resource_test.go
@@ -198,7 +198,7 @@
assertFunc func(err error)
}{ {[]map[string]interface{}{- map[string]interface{}{+ {"title": "My Resource",
"name": "My Name",
"src": "*",
@@ -210,11 +210,11 @@
}},
{[]map[string]interface{}{- map[string]interface{}{+ {"title": "My Logo",
"src": "*loGo*",
},
- map[string]interface{}{+ {"title": "My Resource",
"name": "My Name",
"src": "*",
@@ -229,7 +229,7 @@
}},
{[]map[string]interface{}{- map[string]interface{}{+ {"title": "My Logo",
"src": "*loGo*",
"params": map[string]interface{}{@@ -237,7 +237,7 @@
"icon": "logo",
},
},
- map[string]interface{}{+ {"title": "My Resource",
"src": "*",
"params": map[string]interface{}{@@ -269,11 +269,11 @@
}},
{[]map[string]interface{}{- map[string]interface{}{+ {"name": "Logo Name #:counter",
"src": "*logo*",
},
- map[string]interface{}{+ {"title": "Resource #:counter",
"name": "Name #:counter",
"src": "*",
@@ -293,11 +293,11 @@
}},
{[]map[string]interface{}{- map[string]interface{}{+ {"title": "Third Logo #:counter",
"src": "logo3.png",
},
- map[string]interface{}{+ {"title": "Other Logo #:counter",
"name": "Name #:counter",
"src": "logo*",
@@ -313,11 +313,11 @@
}},
{[]map[string]interface{}{- map[string]interface{}{+ {"title": "Third Logo",
"src": "logo3.png",
},
- map[string]interface{}{+ {"title": "Other Logo #:counter",
"name": "Name #:counter",
"src": "logo*",
@@ -333,11 +333,11 @@
}},
{[]map[string]interface{}{- map[string]interface{}{+ {"name": "third-logo",
"src": "logo3.png",
},
- map[string]interface{}{+ {"title": "Logo #:counter",
"name": "Name #:counter",
"src": "logo*",
@@ -353,7 +353,7 @@
}},
{[]map[string]interface{}{- map[string]interface{}{+ {"title": "Third Logo #:counter",
},
}, func(err error) {@@ -362,7 +362,7 @@
}},
{[]map[string]interface{}{- map[string]interface{}{+ {"title": "Title",
"src": "[]",
},
@@ -469,12 +469,12 @@
b.StopTimer()
var resources Resources
var meta = []map[string]interface{}{- map[string]interface{}{+ {"title": "Foo #:counter",
"name": "Foo Name #:counter",
"src": "foo1*",
},
- map[string]interface{}{+ {"title": "Rest #:counter",
"name": "Rest Name #:counter",
"src": "*",