all: Apply staticcheck recommendations

5 files changed, 4 insertions, 89 deletions

diff --git a/source/fileInfo.go b/source/fileInfo.go
index 752f104e8..3f262fb5e 100644
--- a/source/fileInfo.go
+++ b/source/fileInfo.go
@@ -14,8 +14,6 @@
 package source
 
 import (
-	"fmt"
-	"io"
 	"os"
 	"path/filepath"
 	"strings"
@@ -23,8 +21,6 @@ import (
 
 	"github.com/gohugoio/hugo/common/hugio"
 
-	"github.com/spf13/afero"
-
 	"github.com/gohugoio/hugo/hugofs"
 
 	"github.com/gohugoio/hugo/helpers"
@@ -286,24 +282,3 @@ func (sp *SourceSpec) NewFileInfo(baseDir, filename string, isLeafBundle bool, f
 	return f
 
 }
-
-func printFs(fs afero.Fs, path string, w io.Writer) {
-	if fs == nil {
-		return
-	}
-	afero.Walk(fs, path, func(path string, info os.FileInfo, err error) error {
-
-		if info != nil && !info.IsDir() {
-
-			s := path
-			if lang, ok := info.(hugofs.LanguageAnnouncer); ok {
-				s = s + "\t" + lang.Lang()
-			}
-			if fp, ok := info.(hugofs.FilePather); ok {
-				s = s + "\t" + fp.Filename()
-			}
-			fmt.Fprintln(w, "    ", s)
-		}
-		return nil
-	})
-}
diff --git a/source/filesystem_test.go b/source/filesystem_test.go
index 2c1eeb171..8c8e30413 100644
--- a/source/filesystem_test.go
+++ b/source/filesystem_test.go
@@ -32,14 +32,6 @@ func TestEmptySourceFilesystem(t *testing.T) {
 	}
 }
 
-type TestPath struct {
-	filename string
-	logical  string
-	content  string
-	section  string
-	dir      string
-}
-
 func TestUnicodeNorm(t *testing.T) {
 	if runtime.GOOS != "darwin" {
 		// Normalization code is only for Mac OS, since it is not necessary for other OSes.
diff --git a/source/filesystem_unix_test.go b/source/filesystem_unix_test.go
deleted file mode 100644
index 560d824ae..000000000
--- a/source/filesystem_unix_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015 The Hugo Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build linux darwin !windows
-
-package source
-
-//
-// NOTE, any changes here need to be reflected in filesystem_windows_test.go
-//
-var platformBase = "/base/"
-var platformPaths = []TestPath{
-	{"foobar", "foobar", "aaa", "", ""},
-	{"b/1file", "1file", "aaa", "b", "b/"},
-	{"c/d/2file", "2file", "aaa", "c", "c/d/"},
-	{"/base/e/f/3file", "3file", "aaa", "e", "e/f/"},
-	{"section/foo.rss", "foo.rss", "aaa", "section", "section/"},
-}
diff --git a/source/filesystem_windows_test.go b/source/filesystem_windows_test.go
deleted file mode 100644
index 4662c5fd6..000000000
--- a/source/filesystem_windows_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015 The Hugo Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package source
-
-//
-// NOTE, any changes here need to be reflected in filesystem_linux_test.go
-//
-
-// Note the case of the volume drive.  It must be the same in all examples.
-var platformBase = "C:\\foo\\"
-var platformPaths = []TestPath{
-	{"foobar", "foobar", "aaa", "", ""},
-	{"b\\1file", "1file", "aaa", "b", "b\\"},
-	{"c\\d\\2file", "2file", "aaa", "c", "c\\d\\"},
-	{"C:\\foo\\e\\f\\3file", "3file", "aaa", "e", "e\\f\\"}, // note volume case is equal to platformBase
-	{"section\\foo.rss", "foo.rss", "aaa", "section", "section\\"},
-}
diff --git a/source/sourceSpec.go b/source/sourceSpec.go
index 13aac4592..9731a8d8d 100644
--- a/source/sourceSpec.go
+++ b/source/sourceSpec.go
@@ -124,6 +124,10 @@ func (s *SourceSpec) IsRegularSourceFile(filename string) (bool, error) {
 
 	if fi.Mode()&os.ModeSymlink == os.ModeSymlink {
 		link, err := filepath.EvalSymlinks(filename)
+		if err != nil {
+			return false, err
+		}
+
 		fi, err = helpers.LstatIfPossible(s.SourceFs, link)
 		if err != nil {
 			return false, err