all: Fix some govet complaints

diff --git a/commands/convert.go b/commands/convert.go
index c24282550264ba06cb8947d3805e87973fd95f33..034d5bf556e981c377ae7db295674a74d021c4e2 100644 (file)
--- a/commands/convert.go
+++ b/commands/convert.go
@@ -123,14 +123,14 @@ func convertContents(mark rune) error {
 
                // better handling of dates in formats that don't have support for them
                if mark == parser.FormatToLeadRune("json") || mark == parser.FormatToLeadRune("yaml") || mark == parser.FormatToLeadRune("toml") {
-                       newmetadata := cast.ToStringMap(metadata)
-                       for k, v := range newmetadata {
+                       newMetadata := cast.ToStringMap(metadata)
+                       for k, v := range newMetadata {
                                switch vv := v.(type) {
                                case time.Time:
-                                       newmetadata[k] = vv.Format(time.RFC3339)
+                                       newMetadata[k] = vv.Format(time.RFC3339)
                                }
                        }
-                       metadata = newmetadata
+                       metadata = newMetadata
                }
 
                page.SetDir(filepath.Join(contentDir, file.Dir()))

diff --git a/config/configProvider.go b/config/configProvider.go
index 7f306fa0e0ed1a6d76133df74dc1016935fca4cf..870341f7f935a686f02bf349ffe5bc5bd68e3c5c 100644 (file)
--- a/config/configProvider.go
+++ b/config/configProvider.go
@@ -11,10 +11,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package helpers implements general utility functions that work with
-// and on content.  The helper functions defined here lay down the
-// foundation of how Hugo works with files and filepaths, and perform
-// string operations on content.
 package config
 
 // Provider provides the configuration settings for Hugo.

diff --git a/deps/deps.go b/deps/deps.go
index de1b955cb85064581788d26b45e52cb4c11c2e27..3e97ffd93e4e0f0e6f53e5da1121c7b9a994e21d 100644 (file)
--- a/deps/deps.go
+++ b/deps/deps.go
@@ -45,7 +45,7 @@ type Deps struct {
        translationProvider ResourceProvider
 }
 
-// Used to create and refresh, and clone resources needed.
+// ResourceProvider is used to create and refresh, and clone resources needed.
 type ResourceProvider interface {
        Update(deps *Deps) error
        Clone(deps *Deps) error

diff --git a/hugofs/fs.go b/hugofs/fs.go
index 1ddb9821459504f2c6a6812b65eedd0ff128de99..f79c927db92ec0b4ed25342d5df30cc1c638a099 100644 (file)
--- a/hugofs/fs.go
+++ b/hugofs/fs.go
@@ -44,7 +44,7 @@ func NewDefault(cfg config.Provider) *Fs {
        return newFs(fs, cfg)
 }
 
-// NewDefault creates a new Fs with the MemMapFs
+// NewMem creates a new Fs with the MemMapFs
 // as source and destination file systems.
 // Useful for testing.
 func NewMem(cfg config.Provider) *Fs {

diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go
index 49dd51cd6a3e2d17f4c796bddc1d5ba8232c6cf4..0e7aafe96306e2d1c76ef09c52aed69f033ac4c9 100644 (file)
--- a/hugolib/hugo_sites.go
+++ b/hugolib/hugo_sites.go
@@ -302,7 +302,6 @@ func (h *HugoSites) createMissingPages() error {
        var newPages Pages
 
        for _, s := range h.Sites {
-
                if s.isEnabled(KindHome) {
                        // home pages
                        home := s.findPagesByKind(KindHome)

diff --git a/hugolib/page.go b/hugolib/page.go
index 3169e123a79c2ef3368fe74c9e72fa4064978264..dcfffa666a124508bace2ae8b8ac1dd02608585d 100644 (file)
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -254,8 +254,8 @@ type Position struct {
 
 type Pages []*Page
 
-func (p Pages) String() string {
-       return fmt.Sprintf("Pages(%d)", len(p))
+func (ps Pages) String() string {
+       return fmt.Sprintf("Pages(%d)", len(ps))
 }
 
 func (ps Pages) FindPagePosByFilePath(inPath string) int {

diff --git a/hugolib/page_test.go b/hugolib/page_test.go
index d80516dddbf46e4643dfb0c9236e1bfd7b94da49..ab60876475abf01a8ff41099f87a222ed59b4e3c 100644 (file)
--- a/hugolib/page_test.go
+++ b/hugolib/page_test.go
@@ -1361,7 +1361,7 @@ func TestPageParams(t *testing.T) {
        for i, c := range pagesParamsTemplate {
                p, err := s.NewPageFrom(strings.NewReader(c), "content/post/params.md")
                require.NoError(t, err, "err during parse", "#%d", i)
-               for key, _ := range wantedMap {
+               for key := range wantedMap {
                        assert.Equal(t, wantedMap[key], p.Params[key], "#%d", key)
                }
        }

diff --git a/hugolib/site.go b/hugolib/site.go
index 933f4db04829d51dfda8c6f5cb16647b589db0ac..007ad42460d8c492455a2ffb2a782baa237acac7 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -546,7 +546,6 @@ type whatChanged struct {
 // reBuild partially rebuilds a site given the filesystem events.
 // It returns whetever the content source was changed.
 func (s *Site) reProcess(events []fsnotify.Event) (whatChanged, error) {
-
        s.Log.DEBUG.Printf("Rebuild for events %q", events)
 
        s.timerStep("initialize rebuild")

diff --git a/tpl/tplimpl/template.go b/tpl/tplimpl/template.go
index 012319104899a56865a1096b906b6e3a9d402879..b625f570b9c1cfd437e0b5fc6337a779b99920d5 100644 (file)
--- a/tpl/tplimpl/template.go
+++ b/tpl/tplimpl/template.go
@@ -452,6 +452,7 @@ func (t *GoHTMLTemplate) loadTemplates(absPath string, prefix string) {
                if err != nil {
                        return nil
                }
+
                t.Log.DEBUG.Println("Template path", path)
                if fi.Mode()&os.ModeSymlink == os.ModeSymlink {
                        link, err := filepath.EvalSymlinks(absPath)
@@ -459,11 +460,13 @@ func (t *GoHTMLTemplate) loadTemplates(absPath string, prefix string) {
                                t.Log.ERROR.Printf("Cannot read symbolic link '%s', error was: %s", absPath, err)
                                return nil
                        }
+
                        linkfi, err := t.Fs.Source.Stat(link)
                        if err != nil {
                                t.Log.ERROR.Printf("Cannot stat '%s', error was: %s", link, err)
                                return nil
                        }
+
                        if !linkfi.Mode().IsRegular() {
                                t.Log.ERROR.Printf("Symbolic links for directories not supported, skipping '%s'", absPath)
                        }