all: Run modernize -fix ./...

resources/image_test.go

@@ -348,13 +348,13 @@ func TestImageTransformConcurrent(t *testing.T) {
 
 	image := fetchImageForSpec(spec, c, "sunset.jpg")
 
-	for i := 0; i < 4; i++ {
+	for i := range 4 {
 		wg.Add(1)
 		go func(id int) {
 			defer wg.Done()
-			for j := 0; j < 5; j++ {
+			for j := range 5 {
 				img := image
-				for k := 0; k < 2; k++ {
+				for k := range 2 {
 					r1, err := img.Resize(fmt.Sprintf("%dx", id-k))
 					if err != nil {
 						t.Error(err)
@@ -499,7 +499,7 @@ func BenchmarkImageExif(b *testing.B) {
 
 		b.StartTimer()
 		for i := 0; i < b.N; i++ {
-			for j := 0; j < 10; j++ {
+			for range 10 {
 				getAndCheckExif(c, images[i])
 			}
 		}

resources/images/color.go

@@ -22,6 +22,7 @@ import (
 	"strings"
 
 	"github.com/gohugoio/hugo/common/hstrings"
+	"slices"
 )
 
 type colorGoProvider interface {
@@ -91,11 +92,8 @@ func (c Color) toSRGB(i uint8) float64 {
 // that the palette is valid for the relevant format.
 func AddColorToPalette(c color.Color, p color.Palette) color.Palette {
 	var found bool
-	for _, cc := range p {
-		if c == cc {
-			found = true
-			break
-		}
+	if slices.Contains(p, c) {
+		found = true
 	}
 
 	if !found {

resources/images/imagetesting/testing.go

@@ -209,7 +209,7 @@ func goldenEqual(img1, img2 *image.NRGBA) bool {
 	if len(img1.Pix) != len(img2.Pix) {
 		return false
 	}
-	for i := 0; i < len(img1.Pix); i++ {
+	for i := range img1.Pix {
 		diff := int(img1.Pix[i]) - int(img2.Pix[i])
 		if diff < 0 {
 			diff = -diff

resources/page/page_matcher.go

@@ -24,6 +24,7 @@ import (
 	"github.com/gohugoio/hugo/hugofs/glob"
 	"github.com/gohugoio/hugo/resources/kinds"
 	"github.com/mitchellh/mapstructure"
+	"slices"
 )
 
 // A PageMatcher can be used to match a Page with Glob patterns.
@@ -208,13 +209,7 @@ func decodePageMatcher(m any, v *PageMatcher) error {
 	v.Kind = strings.ToLower(v.Kind)
 	if v.Kind != "" {
 		g, _ := glob.GetGlob(v.Kind)
-		found := false
-		for _, k := range kinds.AllKindsInPages {
-			if g.Match(k) {
-				found = true
-				break
-			}
-		}
+		found := slices.ContainsFunc(kinds.AllKindsInPages, g.Match)
 		if !found {
 			return fmt.Errorf("%q did not match a valid Page Kind", v.Kind)
 		}

resources/page/pagemeta/page_frontmatter.go

@@ -539,7 +539,7 @@ func expandDefaultValues(values []string, defaults []string) []string {
 
 func toLowerSlice(in any) []string {
 	out := cast.ToStringSlice(in)
-	for i := 0; i < len(out); i++ {
+	for i := range out {
 		out[i] = strings.ToLower(out[i])
 	}
 

resources/page/pagemeta/page_frontmatter_test.go

@@ -31,7 +31,7 @@ import (
 func newTestFd() *pagemeta.FrontMatterDescriptor {
 	return &pagemeta.FrontMatterDescriptor{
 		PageConfig: &pagemeta.PageConfig{
-			Params: make(map[string]interface{}),
+			Params: make(map[string]any),
 		},
 		Location: time.UTC,
 	}

resources/page/pages_cache.go

@@ -14,6 +14,7 @@
 package page
 
 import (
+	"slices"
 	"sync"
 )
 
@@ -92,7 +93,7 @@ func (c *pageCache) getP(key string, apply func(p *Pages), pageLists ...Pages) (
 	}
 
 	p := pageLists[0]
-	pagesCopy := append(Pages(nil), p...)
+	pagesCopy := slices.Clone(p)
 
 	if apply != nil {
 		apply(&pagesCopy)
@@ -126,7 +127,7 @@ func pagesEqual(p1, p2 Pages) bool {
 		return true
 	}
 
-	for i := 0; i < len(p1); i++ {
+	for i := range p1 {
 		if p1[i] != p2[i] {
 			return false
 		}

resources/page/pages_cache_test.go

@@ -41,11 +41,11 @@ func TestPageCache(t *testing.T) {
 
 	var testPageSets []Pages
 
-	for i := 0; i < 50; i++ {
+	for i := range 50 {
 		testPageSets = append(testPageSets, createSortTestPages(i+1))
 	}
 
-	for j := 0; j < 100; j++ {
+	for range 100 {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
@@ -75,7 +75,7 @@ func TestPageCache(t *testing.T) {
 func BenchmarkPageCache(b *testing.B) {
 	cache := newPageCache()
 	pages := make(Pages, 30)
-	for i := 0; i < 30; i++ {
+	for i := range 30 {
 		pages[i] = &testPage{title: "p" + strconv.Itoa(i)}
 	}
 	key := "key"

resources/page/pages_sort_test.go

@@ -139,7 +139,7 @@ func TestLimit(t *testing.T) {
 	p := createSortTestPages(10)
 	firstFive := p.Limit(5)
 	c.Assert(len(firstFive), qt.Equals, 5)
-	for i := 0; i < 5; i++ {
+	for i := range 5 {
 		c.Assert(firstFive[i], qt.Equals, p[i])
 	}
 	c.Assert(p.Limit(10), eq, p)
@@ -197,7 +197,7 @@ func TestPageSortByParamNumeric(t *testing.T) {
 
 	n := 10
 	unsorted := createSortTestPages(n)
-	for i := 0; i < n; i++ {
+	for i := range n {
 		v := 100 - i
 		if i%2 == 0 {
 			v = 100.0 - i
@@ -269,7 +269,7 @@ func setSortVals(dates [4]time.Time, titles [4]string, weights [4]int, pages Pag
 func createSortTestPages(num int) Pages {
 	pages := make(Pages, num)
 
-	for i := 0; i < num; i++ {
+	for i := range num {
 		p := newTestPage()
 		p.path = fmt.Sprintf("/x/y/p%d.md", i)
 		p.title = fmt.Sprintf("Title %d", i%((num+1)/2))

resources/page/pagination_test.go

@@ -28,7 +28,7 @@ func TestSplitPages(t *testing.T) {
 	chunks := splitPages(pages, 5)
 	c.Assert(len(chunks), qt.Equals, 5)
 
-	for i := 0; i < 4; i++ {
+	for i := range 4 {
 		c.Assert(chunks[i].Len(), qt.Equals, 5)
 	}
 

resources/page/site.go

@@ -105,7 +105,7 @@ type Site interface {
 	Config() SiteConfig
 
 	// Deprecated: Use taxonomies instead.
-	Author() map[string]interface{}
+	Author() map[string]any
 
 	// Deprecated: Use taxonomies instead.
 	Authors() AuthorList
@@ -173,7 +173,7 @@ func (s *siteWrapper) Social() map[string]string {
 }
 
 // Deprecated: Use taxonomies instead.
-func (s *siteWrapper) Author() map[string]interface{} {
+func (s *siteWrapper) Author() map[string]any {
 	return s.s.Author()
 }
 
@@ -316,7 +316,7 @@ type testSite struct {
 }
 
 // Deprecated: Use taxonomies instead.
-func (s testSite) Author() map[string]interface{} {
+func (s testSite) Author() map[string]any {
 	return nil
 }
 

resources/page/testhelpers_test.go

@@ -587,7 +587,7 @@ func (p *testPage) WordCount(context.Context) int {
 func createTestPages(num int) Pages {
 	pages := make(Pages, num)
 
-	for i := 0; i < num; i++ {
+	for i := range num {
 		m := &testPage{
 			path:           fmt.Sprintf("/x/y/z/p%d.md", i),
 			weight:         5,

resources/postpub/fields.go

@@ -31,7 +31,7 @@ func structToMap(s any) map[string]any {
 	m := make(map[string]any)
 	t := reflect.TypeOf(s)
 
-	for i := 0; i < t.NumMethod(); i++ {
+	for i := range t.NumMethod() {
 		method := t.Method(i)
 		if method.PkgPath != "" {
 			continue
@@ -41,7 +41,7 @@ func structToMap(s any) map[string]any {
 		}
 	}
 
-	for i := 0; i < t.NumField(); i++ {
+	for i := range t.NumField() {
 		field := t.Field(i)
 		if field.PkgPath != "" {
 			continue

resources/resource/resources.go

@@ -24,6 +24,7 @@ import (
 	"github.com/gohugoio/hugo/common/paths"
 	"github.com/gohugoio/hugo/hugofs/glob"
 	"github.com/spf13/cast"
+	"slices"
 )
 
 var _ ResourceFinder = (*Resources)(nil)
@@ -222,7 +223,7 @@ type translatedResource interface {
 
 // MergeByLanguage adds missing translations in r1 from r2.
 func (r Resources) MergeByLanguage(r2 Resources) Resources {
-	result := append(Resources(nil), r...)
+	result := slices.Clone(r)
 	m := make(map[string]bool)
 	for _, rr := range r {
 		if translated, ok := rr.(translatedResource); ok {

resources/resource_factories/bundler/bundler.go

@@ -141,7 +141,7 @@ func (c *Client) Concat(targetPath string, r resource.Resources) (resource.Resou
 			if resolvedm.MainType == media.Builtin.JavascriptType.MainType && resolvedm.SubType == media.Builtin.JavascriptType.SubType {
 				readers := make([]hugio.ReadSeekCloser, 2*len(rcsources)-1)
 				j := 0
-				for i := 0; i < len(rcsources); i++ {
+				for i := range rcsources {
 					if i > 0 {
 						readers[j] = hugio.NewReadSeekerNoOpCloserFromString("\n;\n")
 						j++

resources/resource_factories/bundler/bundler_test.go

@@ -31,7 +31,7 @@ func TestMultiReadSeekCloser(t *testing.T) {
 		hugio.NewReadSeekerNoOpCloserFromString("C"),
 	)
 
-	for i := 0; i < 3; i++ {
+	for range 3 {
 		s1 := helpers.ReaderToString(rc)
 		c.Assert(s1, qt.Equals, "ABC")
 		_, err := rc.Seek(0, 0)

resources/resource_factories/create/create_integration_test.go

@@ -136,7 +136,7 @@ mediaTypes = ['text/plain']
 {{ end }}
 `
 
-	for i := 0; i < numPages; i++ {
+	for i := range numPages {
 		filesTemplate += fmt.Sprintf("-- content/post/p%d.md --\n", i)
 	}
 
@@ -153,7 +153,7 @@ mediaTypes = ['text/plain']
 
 		b.Build()
 
-		for i := 0; i < numPages; i++ {
+		for i := range numPages {
 			b.AssertFileContent(fmt.Sprintf("public/post/p%d/index.html", i), fmt.Sprintf("Content: Response for /post/p%d/.", i))
 		}
 	})

resources/resource_metadata.go

@@ -28,6 +28,7 @@ import (
 
 	"github.com/gohugoio/hugo/common/maps"
 	"github.com/gohugoio/hugo/common/paths"
+	maps0 "maps"
 )
 
 var (
@@ -85,11 +86,9 @@ func (r *metaResource) setName(name string) {
 
 func (r *metaResource) updateParams(params map[string]any) {
 	if r.params == nil {
-		r.params = make(map[string]interface{})
-	}
-	for k, v := range params {
-		r.params[k] = v
+		r.params = make(map[string]any)
 	}
+	maps0.Copy(r.params, params)
 	r.changed = true
 }
 

resources/resource_transformers/cssjs/postcss_integration_test.go

@@ -239,7 +239,7 @@ func TestTransformPostCSSResourceCacheWithPathInBaseURL(t *testing.T) {
 	c.Assert(err, qt.IsNil)
 	c.Cleanup(clean)
 
-	for i := 0; i < 2; i++ {
+	for i := range 2 {
 		files := postCSSIntegrationTestFiles
 
 		if i == 1 {

resources/resources_integration_test.go

@@ -122,7 +122,7 @@ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAA
 
 `
 
-	for i := 0; i < 3; i++ {
+	for range 3 {
 
 		b := hugolib.NewIntegrationTestBuilder(
 			hugolib.IntegrationTestConfig{

resources/transform_test.go

@@ -207,7 +207,7 @@ func TestTransform(t *testing.T) {
 
 		fs := afero.NewMemMapFs()
 
-		for i := 0; i < 2; i++ {
+		for i := range 2 {
 			spec := newTestResourceSpec(specDescriptor{c: c, fs: fs})
 
 			r := createTransformer(c, spec, "f1.txt", "color is blue")
@@ -337,12 +337,12 @@ func TestTransform(t *testing.T) {
 		const count = 26 // A-Z
 
 		transformations := make([]resources.ResourceTransformation, count)
-		for i := 0; i < count; i++ {
+		for i := range count {
 			transformations[i] = createContentReplacer(fmt.Sprintf("t%d", i), fmt.Sprint(i), string(rune(i+65)))
 		}
 
 		var countstr strings.Builder
-		for i := 0; i < count; i++ {
+		for i := range count {
 			countstr.WriteString(fmt.Sprint(i))
 		}
 
@@ -405,18 +405,18 @@ func TestTransform(t *testing.T) {
 		transformers := make([]resources.Transformer, 10)
 		transformations := make([]resources.ResourceTransformation, 10)
 
-		for i := 0; i < 10; i++ {
+		for i := range 10 {
 			transformers[i] = createTransformer(c, spec, fmt.Sprintf("f%d.txt", i), fmt.Sprintf("color is %d", i))
 			transformations[i] = createContentReplacer("test", strconv.Itoa(i), "blue")
 		}
 
 		var wg sync.WaitGroup
 
-		for i := 0; i < 13; i++ {
+		for i := range 13 {
 			wg.Add(1)
 			go func(i int) {
 				defer wg.Done()
-				for j := 0; j < 23; j++ {
+				for j := range 23 {
 					id := (i + j) % 10
 					tr, err := transformers[id].Transform(transformations[id])
 					c.Assert(err, qt.IsNil)