all: Run gofumpt -l -w .

cache/filecache/filecache_config.go

@@ -15,6 +15,7 @@
 package filecache
 
 import (
+	"errors"
 	"fmt"
 	"path"
 	"path/filepath"
@@ -24,8 +25,6 @@ import (
 	"github.com/gohugoio/hugo/common/maps"
 	"github.com/gohugoio/hugo/config"
 
-	"errors"
-
 	"github.com/mitchellh/mapstructure"
 	"github.com/spf13/afero"
 )
@@ -225,7 +224,6 @@ func DecodeConfig(fs afero.Fs, bcfg config.BaseConfig, m map[string]any) (Config
 
 // Resolves :resourceDir => /myproject/resources etc., :cacheDir => ...
 func resolveDirPlaceholder(fs afero.Fs, bcfg config.BaseConfig, placeholder string) (cacheDir string, isResource bool, err error) {
-
 	switch strings.ToLower(placeholder) {
 	case ":resourcedir":
 		return "", true, nil

cache/filecache/filecache_pruner.go

@@ -60,7 +60,6 @@ func (c *Cache) Prune(force bool) (int, error) {
 	counter := 0
 
 	err := afero.Walk(c.Fs, "", func(name string, info os.FileInfo, err error) error {
-
 		if info == nil {
 			return nil
 		}
@@ -69,7 +68,6 @@ func (c *Cache) Prune(force bool) (int, error) {
 
 		if info.IsDir() {
 			f, err := c.Fs.Open(name)
-
 			if err != nil {
 				// This cache dir may not exist.
 				return nil

codegen/methods.go

@@ -461,7 +461,6 @@ func collectMethodsRecursive(pkg string, f []*ast.Field) []string {
 						pkg,
 						tt.Methods.List)...)
 			}
-
 		} else {
 			// Embedded, but in a different file/package. Return the
 			// package.Name and deal with that later.

common/collections/append_test.go

@@ -55,7 +55,7 @@ func TestAppend(t *testing.T) {
 			[]any{&tstSlicerIn1{"c"}},
 			testSlicerInterfaces{&tstSlicerIn1{"a"}, &tstSlicerIn1{"b"}, &tstSlicerIn1{"c"}},
 		},
-		//https://github.com/gohugoio/hugo/issues/5361
+		// https://github.com/gohugoio/hugo/issues/5361
 		{
 			[]string{"a", "b"},
 			[]any{tstSlicers{&tstSlicer{"a"}, &tstSlicer{"b"}}},
@@ -102,22 +102,25 @@ func TestAppendToMultiDimensionalSlice(t *testing.T) {
 		from     []any
 		expected any
 	}{
-		{[][]string{{"a", "b"}},
+		{
+			[][]string{{"a", "b"}},
 			[]any{[]string{"c", "d"}},
 			[][]string{
 				{"a", "b"},
 				{"c", "d"},
 			},
 		},
-		{[][]string{{"a", "b"}},
+		{
+			[][]string{{"a", "b"}},
 			[]any{[]string{"c", "d"}, []string{"e", "f"}},
 			[][]string{
 				{"a", "b"},
 				{"c", "d"},
 				{"e", "f"},
 			},
 		},
-		{[][]string{{"a", "b"}},
+		{
+			[][]string{{"a", "b"}},
 			[]any{[]int{1, 2}},
 			false,
 		},
@@ -130,7 +133,6 @@ func TestAppendToMultiDimensionalSlice(t *testing.T) {
 			c.Assert(result, qt.DeepEquals, test.expected)
 		}
 	}
-
 }
 
 func TestAppendShouldMakeACopyOfTheInputSlice(t *testing.T) {

common/collections/slice.go

@@ -73,7 +73,6 @@ func StringSliceToInterfaceSlice(ss []string) []any {
 		result[i] = s
 	}
 	return result
-
 }
 
 type SortedStringSlice []string

common/collections/slice_test.go

@@ -135,5 +135,4 @@ func TestSortedStringSlice(t *testing.T) {
 	c.Assert(s.Count("b"), qt.Equals, 3)
 	c.Assert(s.Count("z"), qt.Equals, 0)
 	c.Assert(s.Count("a"), qt.Equals, 1)
-
 }

common/hexec/exec.go

@@ -19,11 +19,10 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"regexp"
-	"strings"
-
 	"os"
 	"os/exec"
+	"regexp"
+	"strings"
 
 	"github.com/cli/safeexec"
 	"github.com/gohugoio/hugo/config"
@@ -142,7 +141,6 @@ func (e *Exec) New(name string, arg ...any) (Runner, error) {
 	}
 
 	return cm.command(arg...)
-
 }
 
 // Npx is a convenience method to create a Runner running npx --no-install <name> <args.

common/htime/time_test.go

@@ -53,7 +53,6 @@ func TestTimeFormatter(t *testing.T) {
 		c.Assert(f.Format(june06, ":time_long"), qt.Equals, "02:09:37 UTC")
 		c.Assert(f.Format(june06, ":time_medium"), qt.Equals, "02:09:37")
 		c.Assert(f.Format(june06, ":time_short"), qt.Equals, "02:09")
-
 	})
 
 	c.Run("Custom layouts English", func(c *qt.C) {
@@ -68,7 +67,6 @@ func TestTimeFormatter(t *testing.T) {
 		c.Assert(f.Format(june06, ":time_long"), qt.Equals, "2:09:37 am UTC")
 		c.Assert(f.Format(june06, ":time_medium"), qt.Equals, "2:09:37 am")
 		c.Assert(f.Format(june06, ":time_short"), qt.Equals, "2:09 am")
-
 	})
 
 	c.Run("English", func(c *qt.C) {
@@ -107,9 +105,7 @@ func TestTimeFormatter(t *testing.T) {
 			c.Assert(tr.MonthWide(date.Month()), qt.Equals, monthWideNorway)
 			c.Assert(f.Format(date, "January"), qt.Equals, monthWideNorway)
 		}
-
 	})
-
 }
 
 func BenchmarkTimeFormatter(b *testing.B) {

common/maps/maps_test.go

@@ -192,5 +192,4 @@ func TestLookupEqualFold(t *testing.T) {
 	v, found = LookupEqualFold(m2, "b")
 	c.Assert(found, qt.IsTrue)
 	c.Assert(v, qt.Equals, "bv")
-
 }

common/maps/params_test.go

@@ -154,7 +154,6 @@ func TestParamsSetAndMerge(t *testing.T) {
 		"a": "av",
 		"c": "cv",
 	})
-
 }
 
 func TestParamsIsZero(t *testing.T) {

common/paths/url.go

@@ -163,7 +163,6 @@ func Uglify(in string) string {
 // If ParseRequestURI fails, the input is just converted to OS specific slashes and returned.
 func UrlToFilename(s string) (string, bool) {
 	u, err := url.ParseRequestURI(s)
-
 	if err != nil {
 		return filepath.FromSlash(s), false
 	}

common/text/transform_test.go

@@ -57,7 +57,6 @@ line 3`
 	c := qt.New(t)
 
 	c.Assert(collected, qt.DeepEquals, []string{"line 1\n", "line 2\n", "\n", "line 3"})
-
 }
 
 func BenchmarkVisitLinesAfter(b *testing.B) {
@@ -68,9 +67,6 @@ func BenchmarkVisitLinesAfter(b *testing.B) {
 
 	for i := 0; i < b.N; i++ {
 		VisitLinesAfter(lines, func(s string) {
-
 		})
-
 	}
-
 }

common/types/convert.go

@@ -80,7 +80,6 @@ func ToStringSlicePreserveStringE(v any) ([]string, error) {
 	default:
 		return nil, fmt.Errorf("failed to convert %T to a string slice", v)
 	}
-
 }
 
 // TypeToString converts v to a string if it's a valid string type.

common/types/convert_test.go

@@ -45,5 +45,4 @@ func TestToDuration(t *testing.T) {
 	c.Assert(ToDuration("200"), qt.Equals, 200*time.Millisecond)
 	c.Assert(ToDuration("4m"), qt.Equals, 4*time.Minute)
 	c.Assert(ToDuration("asdfadf"), qt.Equals, time.Duration(0))
-
 }

compare/compare_strings_test.go

@@ -79,5 +79,4 @@ func BenchmarkStringSort(b *testing.B) {
 			})
 		}
 	})
-
 }

config/allconfig/load_test.go

@@ -50,7 +50,7 @@ weight = 3
 title = "Svenska"
 weight = 4
 `
-	if err := os.WriteFile(configFilename, []byte(config), 0666); err != nil {
+	if err := os.WriteFile(configFilename, []byte(config), 0o666); err != nil {
 		b.Fatal(err)
 	}
 	d := ConfigSourceDescriptor{

config/configLoader.go

@@ -208,7 +208,6 @@ func LoadConfigFromDir(sourceFs afero.Fs, configDir, environment string) (Provid
 	}
 
 	return cfg, dirnames, nil
-
 }
 
 var keyAliases maps.KeyRenamer

config/defaultConfigProvider.go

@@ -370,7 +370,6 @@ func (c *defaultConfigProvider) SetDefaultMergeStrategy() {
 		}
 		return false
 	})
-
 }
 
 func (c *defaultConfigProvider) getNestedKeyAndMap(key string, create bool) (string, maps.Params) {

config/env.go

@@ -49,7 +49,6 @@ func GetMemoryLimit() uint64 {
 		if v := stringToGibabyte(mem); v > 0 {
 			return v
 		}
-
 	}
 
 	// There is a FreeMemory function, but as the kernel in most situations

config/security/whitelist_test.go

@@ -43,5 +43,4 @@ func TestWhitelist(t *testing.T) {
 		c.Assert(w.Accept("bar"), qt.IsTrue)
 		c.Assert(w.Accept("mbar"), qt.IsFalse)
 	})
-
 }

deploy/deployConfig.go

@@ -14,11 +14,10 @@
 package deploy
 
 import (
+	"errors"
 	"fmt"
 	"regexp"
 
-	"errors"
-
 	"github.com/gobwas/glob"
 	"github.com/gohugoio/hugo/config"
 	hglob "github.com/gohugoio/hugo/hugofs/glob"
@@ -132,7 +131,6 @@ var DefaultConfig = DeployConfig{
 
 // DecodeConfig creates a config from a given Hugo configuration.
 func DecodeConfig(cfg config.Provider) (DeployConfig, error) {
-
 	dcfg := DefaultConfig
 
 	if !cfg.IsSet(deploymentConfigKey) {

htesting/test_helpers_test.go

@@ -20,12 +20,10 @@ import (
 )
 
 func TestExtractMinorVersionFromGoTag(t *testing.T) {
-
 	c := qt.New(t)
 
 	c.Assert(extractMinorVersionFromGoTag("go1.17"), qt.Equals, 17)
 	c.Assert(extractMinorVersionFromGoTag("go1.16.7"), qt.Equals, 16)
 	c.Assert(extractMinorVersionFromGoTag("go1.17beta1"), qt.Equals, 17)
 	c.Assert(extractMinorVersionFromGoTag("asdfadf"), qt.Equals, -1)
-
 }

hugofs/createcounting_fs.go

@@ -33,9 +33,7 @@ type DuplicatesReporter interface {
 	ReportDuplicates() string
 }
 
-var (
-	_ FilesystemUnwrapper = (*createCountingFs)(nil)
-)
+var _ FilesystemUnwrapper = (*createCountingFs)(nil)
 
 func NewCreateCountingFs(fs afero.Fs) afero.Fs {
 	return &createCountingFs{Fs: fs, fileCount: make(map[string]int)}

hugofs/glob/glob_test.go

@@ -75,7 +75,6 @@ func TestGetGlob(t *testing.T) {
 }
 
 func BenchmarkGetGlob(b *testing.B) {
-
 	runBench := func(name string, cache *globCache, search string) {
 		b.Run(name, func(b *testing.B) {
 			g, err := GetGlob("**/foo")

hugolib/404_test.go

@@ -41,8 +41,8 @@ Data: {{ len .Data }}|
 		IntegrationTestConfig{
 			T:           t,
 			TxtarString: files,
-			//LogLevel:    logg.LevelTrace,
-			//Verbose:     true,
+			// LogLevel:    logg.LevelTrace,
+			// Verbose:     true,
 		},
 	).Build()
 

hugolib/config.go

@@ -157,7 +157,7 @@ module github.com/bep/mymod
 
 	tempDir := os.TempDir()
 	cacheDir := filepath.Join(tempDir, "hugocache")
-	if err := os.MkdirAll(cacheDir, 0777); err != nil {
+	if err := os.MkdirAll(cacheDir, 0o777); err != nil {
 		return nil, err
 	}
 	cfg.Set("cacheDir", cacheDir)
@@ -168,11 +168,11 @@ module github.com/bep/mymod
 
 	fs := afero.NewOsFs()
 
-	if err := afero.WriteFile(fs, filepath.Join(tempDir, "hugo.toml"), []byte(configToml), 0644); err != nil {
+	if err := afero.WriteFile(fs, filepath.Join(tempDir, "hugo.toml"), []byte(configToml), 0o644); err != nil {
 		return nil, err
 	}
 
-	if err := afero.WriteFile(fs, filepath.Join(tempDir, "go.mod"), []byte(goMod), 0644); err != nil {
+	if err := afero.WriteFile(fs, filepath.Join(tempDir, "go.mod"), []byte(goMod), 0o644); err != nil {
 		return nil, err
 	}
 
@@ -181,5 +181,4 @@ module github.com/bep/mymod
 		return nil, err
 	}
 	return conf.Base, err
-
 }

hugolib/language_test.go

@@ -26,7 +26,7 @@ import (
 func TestI18n(t *testing.T) {
 	c := qt.New(t)
 
-	//https://github.com/gohugoio/hugo/issues/7804
+	// https://github.com/gohugoio/hugo/issues/7804
 	c.Run("pt-br should be case insensitive", func(c *qt.C) {
 		b := newTestSitesBuilder(c)
 		langCode := func() string {
@@ -76,12 +76,10 @@ name = "foo-a"
 
 		menus := b.H.Sites[0].Menus()
 		c.Assert(menus, qt.HasLen, 1)
-
 	})
 }
 
 func TestLanguageNumberFormatting(t *testing.T) {
-
 	b := newTestSitesBuilder(t)
 	b.WithConfigFile("toml", `
 baseURL = "https://example.org"

langs/language_test.go

@@ -23,7 +23,6 @@ import (
 )
 
 func TestCollator(t *testing.T) {
-
 	c := qt.New(t)
 
 	var wg sync.WaitGroup
@@ -43,7 +42,6 @@ func TestCollator(t *testing.T) {
 		}()
 	}
 	wg.Wait()
-
 }
 
 func BenchmarkCollator(b *testing.B) {
@@ -75,5 +73,4 @@ func BenchmarkCollator(b *testing.B) {
 			}
 		})
 	})
-
 }

lazy/init_test.go

@@ -234,5 +234,4 @@ func TestResetError(t *testing.T) {
 	r = true
 	_, err = i.Do(context.Background())
 	c.Assert(err, qt.IsNil)
-
 }