Cleanup formatting - go fmt ./...

Remember to run go fmt ./... before committing.  Looks sternly in mirror

diff --git a/hugolib/helpers.go b/hugolib/helpers.go
index 9695f6310835fc43aab0476f04000152f5748b59..cf84835fd7165970abe8adbcae8ba3582aba7a79 100644 (file)
--- a/hugolib/helpers.go
+++ b/hugolib/helpers.go
@@ -334,7 +334,7 @@ func MakePermalink(domain string, path string) string {
 }
 
 func getSummaryString(content []byte) ([]byte, bool) {
-       if (bytes.Contains(content, summaryDivider)) {
+       if bytes.Contains(content, summaryDivider) {
                return bytes.Split(content, summaryDivider)[0], false
        } else {
                plainContent := StripHTML(StripShortcodes(string(content)))

diff --git a/hugolib/site.go b/hugolib/site.go
index 4f844448031032824138666a3a4570588229acb0..af72fd3bf57714726b2f7f61f08f7eb6a53892da 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -121,7 +121,7 @@ func (site *Site) Render() (err error) {
        site.timerStep("render pages")
        if err = site.RenderHomePage(); err != nil {
                return
-        }
+       }
        site.timerStep("render and write homepage")
        return
 }
@@ -203,7 +203,7 @@ func (s *Site) initialize() {
 
        s.checkDirectories()
 
-       staticDir := s.Config.GetAbsPath(s.Config.StaticDir+"/")
+       staticDir := s.Config.GetAbsPath(s.Config.StaticDir + "/")
 
        walker := func(path string, fi os.FileInfo, err error) error {
                if err != nil {
@@ -212,7 +212,7 @@ func (s *Site) initialize() {
                }
 
                if fi.IsDir() {
-                       if (path == staticDir) {
+                       if path == staticDir {
                                return filepath.SkipDir
                        }
                        site.Directories = append(site.Directories, path)
@@ -432,7 +432,7 @@ func inStringArray(arr []string, el string) bool {
 func (s *Site) RenderAliases() error {
        for i, p := range s.Pages {
                for _, a := range p.Aliases {
-                       t := "alias";
+                       t := "alias"
                        if strings.HasSuffix(a, ".xhtml") {
                                t = "alias-xhtml"
                        }

diff --git a/hugolib/site_test.go b/hugolib/site_test.go
index 249eba26681ece249c31455731a8e2bf6292e5f0..4df0bd60426458b8f0aa6d9ac6136dc0f2501703 100644 (file)
--- a/hugolib/site_test.go
+++ b/hugolib/site_test.go
@@ -1,8 +1,8 @@
 package hugolib
 
 import (
-       "fmt"
        "bytes"
+       "fmt"
        "strings"
        "testing"
 )
@@ -164,16 +164,17 @@ func TestRenderThingOrDefault(t *testing.T) {
                if string(html.Bytes()) != test.expected {
                        t.Errorf("Content does not match.  Expected '%s', got '%s'", test.expected, html)
                }
-       }}
+       }
+}
 
 func TestSetOutFile(t *testing.T) {
-    s := new(Site)
+       s := new(Site)
        p := pageMust(ReadFrom(strings.NewReader(PAGE_URL_SPECIFIED), "content/a/file.md"))
-    s.setOutFile(p)
+       s.setOutFile(p)
 
-    expected := "mycategory/my-whatever-content/index.html"
+       expected := "mycategory/my-whatever-content/index.html"
 
-    if p.OutFile != "mycategory/my-whatever-content/index.html" {
-        t.Errorf("Outfile does not match.  Expected '%s', got '%s'", expected, p.OutFile)
-    }
+       if p.OutFile != "mycategory/my-whatever-content/index.html" {
+               t.Errorf("Outfile does not match.  Expected '%s', got '%s'", expected, p.OutFile)
+       }
 }