]> git.maquefel.me Git - brevno-suite/hugo/commitdiff
all: Run gofumpt -l -w .
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Sun, 28 Jan 2024 21:34:10 +0000 (22:34 +0100)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Sun, 28 Jan 2024 22:14:09 +0000 (23:14 +0100)
77 files changed:
cache/filecache/filecache_config.go
cache/filecache/filecache_pruner.go
codegen/methods.go
common/collections/append_test.go
common/collections/slice.go
common/collections/slice_test.go
common/hexec/exec.go
common/htime/time_test.go
common/maps/maps_test.go
common/maps/params_test.go
common/paths/url.go
common/text/transform_test.go
common/types/convert.go
common/types/convert_test.go
compare/compare_strings_test.go
config/allconfig/load_test.go
config/configLoader.go
config/defaultConfigProvider.go
config/env.go
config/security/whitelist_test.go
deploy/deployConfig.go
htesting/test_helpers_test.go
hugofs/createcounting_fs.go
hugofs/glob/glob_test.go
hugolib/404_test.go
hugolib/config.go
hugolib/language_test.go
langs/language_test.go
lazy/init_test.go
markup/goldmark/images/transform.go
markup/goldmark/internal/extensions/attributes/attributes.go
markup/internal/external.go
markup/markup_config/config_test.go
markup/pandoc/convert.go
markup/rst/convert.go
markup/tableofcontents/tableofcontents_test.go
media/builtin.go
minifiers/minifiers_test.go
modules/client.go
modules/config_test.go
modules/module.go
navigation/pagemenus.go
output/docshelper.go
output/layouts/layout_test.go
output/outputFormat_test.go
parser/metadecoders/decoder_test.go
parser/pageparser/item_test.go
parser/pageparser/pagelexer_shortcode.go
publisher/htmlElementsCollector.go
publisher/htmlElementsCollector_test.go
related/inverted_index_test.go
resources/images/color.go
resources/page/page_matcher_test.go
resources/resource_factories/create/remote_test.go
resources/resource_transformers/tocss/dartsass/dartsass_integration_test.go
resources/resource_transformers/tocss/scss/client_extended.go
resources/resource_transformers/tocss/scss/scss_integration_test.go
tpl/cast/cast.go
tpl/collections/merge.go
tpl/collections/reflect_helpers.go
tpl/collections/where_test.go
tpl/crypto/crypto.go
tpl/css/css.go
tpl/data/data_test.go
tpl/images/images.go
tpl/images/images_test.go
tpl/internal/templatefuncRegistry_test.go
tpl/math/math.go
tpl/path/path.go
tpl/strings/regexp.go
tpl/strings/regexp_test.go
tpl/strings/truncate_test.go
tpl/time/time_test.go
tpl/tplimpl/shortcodes.go
tpl/transform/remarshal.go
tpl/urls/urls.go
watcher/filenotify/poller.go

index 1d57fe72e1347e0da54ad1e91af71b2467a5766d..6a2b5f3e30a567d67e3a57768a3acbe6b0daf4a6 100644 (file)
@@ -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
index 2ad6c0bb7e05927db78fd7dd279898d2e9c60dc7..6f224cef4ddd14e84f885209a4ef529e25b262c1 100644 (file)
@@ -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
index 65a7cc2b7520ab5e41ae898ca49e34b3a6c85957..299063bb5321a7a7d2daced414b7ff42ad654d9f 100644 (file)
@@ -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.
index 3c2aab2db99b138989f76ac2f7bb95b7e438d7d9..f791b731a041c62df4c6dfdcb4e5184a28bfea76 100644 (file)
@@ -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,14 +102,16 @@ 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"},
@@ -117,7 +119,8 @@ func TestAppendToMultiDimensionalSlice(t *testing.T) {
                                {"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) {
index bf5c7b52b3061fa3c79914ab06198c078500dee8..731f489f9bdd5ff8f602df97408af699deaa7ad0 100644 (file)
@@ -73,7 +73,6 @@ func StringSliceToInterfaceSlice(ss []string) []any {
                result[i] = s
        }
        return result
-
 }
 
 type SortedStringSlice []string
index 5788b9161c8f58c105ecd1bf2bbe4757b1e785c0..20961aac02027da10b264093be58523be86939f0 100644 (file)
@@ -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)
-
 }
index 95e5162fc3ecbb8f8f5fe42e09f1a0d321e398c0..12775bd1ce8b9de8d1977979f26655f98a990dc9 100644 (file)
@@ -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.
index 6cb32340966e73a40e92ffdc1555c74851b7858a..78954887e3a04754534390afaa88c857854d3951 100644 (file)
@@ -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) {
index 0e8589d347b62dce0a9b1fd42fd314a0baa98213..098098388af732b16319cc9044f2e245f37c31fc 100644 (file)
@@ -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")
-
 }
index 578b2a576e9de13f66ef1e77dd25ce485a2d9fe6..892c77175836e9cdfc7d4d5479e5aae05b008d01 100644 (file)
@@ -154,7 +154,6 @@ func TestParamsSetAndMerge(t *testing.T) {
                "a": "av",
                "c": "cv",
        })
-
 }
 
 func TestParamsIsZero(t *testing.T) {
index 4c4a7f2dc9c992d6a2ef9ddce5be4d26f28e1234..75b4b644a94baae25a1a8776cb9908b5e6d0fa37 100644 (file)
@@ -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
        }
index 41447715f4765459d62557f2bc3e7931c2cc3cd5..74bb37783e069fac7f44d55047902a2ee4975312 100644 (file)
@@ -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) {
-
                })
-
        }
-
 }
index fbeab5b9197cc1ae844e20f6e01966952daaa6e2..0cb5035dffa56aaa54ec084c3d8207295920cf7e 100644 (file)
@@ -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.
index 215117441bc1aa129ad3e5b1f38d82dd2f435a7c..13059285d5f40778ba19c8602e1a4b2342ebb028 100644 (file)
@@ -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))
-
 }
index a73091fc65a2ce4d496d12f13b9532f69f223f36..1a5bb0b1a115486013a2e61025856d0f7e468243 100644 (file)
@@ -79,5 +79,4 @@ func BenchmarkStringSort(b *testing.B) {
                        })
                }
        })
-
 }
index 153a59c4475a6d8d326cc9a1aa62b260c89bd1f9..3c16e71e9502f735b914d3518e256d94a0c88549 100644 (file)
@@ -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{
index 656ef7f7e68fe774a5e1230620cd9ae773df7129..dd103f27b8ea4ab44ae7b65001b94e7e762b2ba6 100644 (file)
@@ -208,7 +208,6 @@ func LoadConfigFromDir(sourceFs afero.Fs, configDir, environment string) (Provid
        }
 
        return cfg, dirnames, nil
-
 }
 
 var keyAliases maps.KeyRenamer
index e8a08e281109a50831cc3dc4d099d6a673d4358f..f840c6cb0551ed29bd5afe8f5445f221f4e9994f 100644 (file)
@@ -370,7 +370,6 @@ func (c *defaultConfigProvider) SetDefaultMergeStrategy() {
                }
                return false
        })
-
 }
 
 func (c *defaultConfigProvider) getNestedKeyAndMap(key string, create bool) (string, maps.Params) {
index 0ad5ecaeabd435c3c20f96d4b4e44d4df810069e..4dcd636539290f65e0ebebf54a052b1188f5368a 100644 (file)
@@ -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
index 89d1bc2b109bc291e581cd01059953ac6d113678..add3345a8da221b734cee2f520179d80de6e67af 100644 (file)
@@ -43,5 +43,4 @@ func TestWhitelist(t *testing.T) {
                c.Assert(w.Accept("bar"), qt.IsTrue)
                c.Assert(w.Accept("mbar"), qt.IsFalse)
        })
-
 }
index 3cd5dc3a8214f4b274cbceb115be153eeb4d25a8..f9454b3e40e7330b533209217714be844d7141e9 100644 (file)
 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) {
index 3e767ac9d8569aa1c5346a81e22ab8a99bd3cd41..bec81cccf6b330b8a5f9561fef456f75599f5bd6 100644 (file)
@@ -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)
-
 }
index 1737ad5ce24be8bd877bbaaf91355d1b330ed9d2..901deb3ae47c058f88f16d30115b557731a671bd 100644 (file)
@@ -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)}
index 454fb850a1d8fa660b5b9f7c174fe2ece6536dc3..b63854e2971a81402dca6aa30af457595301f7cb 100644 (file)
@@ -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")
index 3c6a06045f24fa381a1674e62c65405c46a8f459..fef02090559e6018f238e7528c8bf132ad66a924 100644 (file)
@@ -41,8 +41,8 @@ Data: {{ len .Data }}|
                IntegrationTestConfig{
                        T:           t,
                        TxtarString: files,
-                       //LogLevel:    logg.LevelTrace,
-                       //Verbose:     true,
+                       // LogLevel:    logg.LevelTrace,
+                       // Verbose:     true,
                },
        ).Build()
 
index 70dd790fe4a9fe39183ac1bf80b5edd291dd2a95..13167dafd68199209e6606fce026c475767776a6 100644 (file)
@@ -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
-
 }
index 74f80a29de0b63ac74e8e1f92d7eb5e5e6e6b66e..c9368770e4559b4d789ca241f2e5e58629d38218 100644 (file)
@@ -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"
index e2c7345671b8cf10030280d5b51545cb1209dc0f..543f4a133fb887526366be6f3faf6d63274e2e50 100644 (file)
@@ -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) {
                        }
                })
        })
-
 }
index efc329d797e7f7863d0ade823b51476a98fc9824..96a9594941f0bb56ac74e09f6dfb3089d0967b0a 100644 (file)
@@ -234,5 +234,4 @@ func TestResetError(t *testing.T) {
        r = true
        _, err = i.Do(context.Background())
        c.Assert(err, qt.IsNil)
-
 }
index 4eb793ae15811ac2509dcc84b1d72c55dd1300a0..2e97a67911e1a1d7c618454bf86854455a4cbde3 100644 (file)
@@ -71,7 +71,5 @@ func (t *Transformer) Transform(doc *ast.Document, reader text.Reader, pctx pars
                }
 
                return ast.WalkContinue, nil
-
        })
-
 }
index 60ae609ec6418f831133430e4b6974208e09a681..feb3d915bda6154b11ebbbb57ed26ddf97f34011 100644 (file)
@@ -56,7 +56,7 @@ func (a *attrParser) Continue(node ast.Node, reader text.Reader, pc parser.Conte
 func (a *attrParser) Open(parent ast.Node, reader text.Reader, pc parser.Context) (ast.Node, parser.State) {
        if attrs, ok := parser.ParseAttributes(reader); ok {
                // add attributes
-               var node = &attributesBlock{
+               node := &attributesBlock{
                        BaseBlock: ast.BaseBlock{},
                }
                for _, attr := range attrs {
@@ -95,7 +95,7 @@ func (a *attributesBlock) Kind() ast.NodeKind {
 type transformer struct{}
 
 func (a *transformer) Transform(node *ast.Document, reader text.Reader, pc parser.Context) {
-       var attributes = make([]ast.Node, 0, 500)
+       attributes := make([]ast.Node, 0, 500)
        ast.Walk(node, func(node ast.Node, entering bool) (ast.WalkStatus, error) {
                if entering && node.Kind() == kindAttributesBlock {
                        // Attributes for fenced code blocks are handled in their own extension,
index 97cf5cc7d3cf19dd1f0af100cf43080a3d8c0142..dc8cc61c20ff7c922ae99d5b639eb16e95116dcf 100644 (file)
@@ -13,7 +13,8 @@ import (
 func ExternallyRenderContent(
        cfg converter.ProviderConfig,
        ctx converter.DocumentContext,
-       content []byte, binaryName string, args []string) ([]byte, error) {
+       content []byte, binaryName string, args []string,
+) ([]byte, error) {
        logger := cfg.Logger
 
        if strings.Contains(binaryName, "/") {
index 782cedbc978b5d1a908ed7ff30770690f3a75063..5169bd79fc871e0da316d17f1e0b2288e06da27b 100644 (file)
@@ -83,7 +83,5 @@ func TestConfig(t *testing.T) {
                c.Assert(err, qt.IsNil)
                c.Assert(conf.Goldmark.Extensions.Typographer.Disable, qt.Equals, false)
                c.Assert(conf.Goldmark.Extensions.Typographer.Ellipsis, qt.Equals, "&hellip;")
-
        })
-
 }
index eaa9bfb6a3453e6a594e057889db9e878144ea5f..8f2d99c9a83491832670f77e9fe996ca6694d95e 100644 (file)
@@ -26,8 +26,7 @@ import (
 // Provider is the package entry point.
 var Provider converter.ProviderProvider = provider{}
 
-type provider struct {
-}
+type provider struct{}
 
 func (p provider) New(cfg converter.ProviderConfig) (converter.Provider, error) {
        return converter.NewProvider("pandoc", func(ctx converter.DocumentContext) (converter.Converter, error) {
index b7aa5a2cefd609a2e0d639e01038939b7e6f4b20..398f5eb0c3af294c888d1028a4fdaae591b1dc7a 100644 (file)
@@ -30,8 +30,7 @@ import (
 // Provider is the package entry point.
 var Provider converter.ProviderProvider = provider{}
 
-type provider struct {
-}
+type provider struct{}
 
 func (p provider) New(cfg converter.ProviderConfig) (converter.Provider, error) {
        return converter.NewProvider("rst", func(ctx converter.DocumentContext) (converter.Converter, error) {
index ac9ad0eed67ec61150eeb0b100c6240d4e013277..3af9c4eb664418a8613419babf8ab822352f185b 100644 (file)
@@ -186,7 +186,6 @@ func TestTocMisc(t *testing.T) {
 }
 
 func BenchmarkToc(b *testing.B) {
-
        newTocs := func(n int) []*Fragments {
                var tocs []*Fragments
                for i := 0; i < n; i++ {
@@ -216,5 +215,4 @@ func BenchmarkToc(b *testing.B) {
                        toc.ToHTML(1, -1, false)
                }
        })
-
 }
index 64b5163b85c8041547d3ef21c90d2192b7b6dec6..aafe245c9f80e1671e7a089c5c7afc6db0d1375a 100644 (file)
@@ -51,58 +51,56 @@ type BuiltinTypes struct {
        OctetType Type
 }
 
-var (
-       Builtin = BuiltinTypes{
-               CalendarType:   Type{Type: "text/calendar"},
-               CSSType:        Type{Type: "text/css"},
-               SCSSType:       Type{Type: "text/x-scss"},
-               SASSType:       Type{Type: "text/x-sass"},
-               CSVType:        Type{Type: "text/csv"},
-               HTMLType:       Type{Type: "text/html"},
-               JavascriptType: Type{Type: "text/javascript"},
-               TypeScriptType: Type{Type: "text/typescript"},
-               TSXType:        Type{Type: "text/tsx"},
-               JSXType:        Type{Type: "text/jsx"},
-
-               JSONType:           Type{Type: "application/json"},
-               WebAppManifestType: Type{Type: "application/manifest+json"},
-               RSSType:            Type{Type: "application/rss+xml"},
-               XMLType:            Type{Type: "application/xml"},
-               SVGType:            Type{Type: "image/svg+xml"},
-               TextType:           Type{Type: "text/plain"},
-               TOMLType:           Type{Type: "application/toml"},
-               YAMLType:           Type{Type: "application/yaml"},
-
-               // Common image types
-               PNGType:  Type{Type: "image/png"},
-               JPEGType: Type{Type: "image/jpeg"},
-               GIFType:  Type{Type: "image/gif"},
-               TIFFType: Type{Type: "image/tiff"},
-               BMPType:  Type{Type: "image/bmp"},
-               WEBPType: Type{Type: "image/webp"},
-
-               // Common font types
-               TrueTypeFontType: Type{Type: "font/ttf"},
-               OpenTypeFontType: Type{Type: "font/otf"},
-
-               // Common document types
-               PDFType:      Type{Type: "application/pdf"},
-               MarkdownType: Type{Type: "text/markdown"},
-
-               // Common video types
-               AVIType:  Type{Type: "video/x-msvideo"},
-               MPEGType: Type{Type: "video/mpeg"},
-               MP4Type:  Type{Type: "video/mp4"},
-               OGGType:  Type{Type: "video/ogg"},
-               WEBMType: Type{Type: "video/webm"},
-               GPPType:  Type{Type: "video/3gpp"},
-
-               // Web assembly.
-               WasmType: Type{Type: "application/wasm"},
-
-               OctetType: Type{Type: "application/octet-stream"},
-       }
-)
+var Builtin = BuiltinTypes{
+       CalendarType:   Type{Type: "text/calendar"},
+       CSSType:        Type{Type: "text/css"},
+       SCSSType:       Type{Type: "text/x-scss"},
+       SASSType:       Type{Type: "text/x-sass"},
+       CSVType:        Type{Type: "text/csv"},
+       HTMLType:       Type{Type: "text/html"},
+       JavascriptType: Type{Type: "text/javascript"},
+       TypeScriptType: Type{Type: "text/typescript"},
+       TSXType:        Type{Type: "text/tsx"},
+       JSXType:        Type{Type: "text/jsx"},
+
+       JSONType:           Type{Type: "application/json"},
+       WebAppManifestType: Type{Type: "application/manifest+json"},
+       RSSType:            Type{Type: "application/rss+xml"},
+       XMLType:            Type{Type: "application/xml"},
+       SVGType:            Type{Type: "image/svg+xml"},
+       TextType:           Type{Type: "text/plain"},
+       TOMLType:           Type{Type: "application/toml"},
+       YAMLType:           Type{Type: "application/yaml"},
+
+       // Common image types
+       PNGType:  Type{Type: "image/png"},
+       JPEGType: Type{Type: "image/jpeg"},
+       GIFType:  Type{Type: "image/gif"},
+       TIFFType: Type{Type: "image/tiff"},
+       BMPType:  Type{Type: "image/bmp"},
+       WEBPType: Type{Type: "image/webp"},
+
+       // Common font types
+       TrueTypeFontType: Type{Type: "font/ttf"},
+       OpenTypeFontType: Type{Type: "font/otf"},
+
+       // Common document types
+       PDFType:      Type{Type: "application/pdf"},
+       MarkdownType: Type{Type: "text/markdown"},
+
+       // Common video types
+       AVIType:  Type{Type: "video/x-msvideo"},
+       MPEGType: Type{Type: "video/mpeg"},
+       MP4Type:  Type{Type: "video/mp4"},
+       OGGType:  Type{Type: "video/ogg"},
+       WEBMType: Type{Type: "video/webm"},
+       GPPType:  Type{Type: "video/3gpp"},
+
+       // Web assembly.
+       WasmType: Type{Type: "application/wasm"},
+
+       OctetType: Type{Type: "application/octet-stream"},
+}
 
 var defaultMediaTypesConfig = map[string]any{
        "text/calendar":   map[string]any{"suffixes": []string{"ics"}},
index af1b5d996c1a2a5fb3ae8d2632273f00146722eb..bfd743fae3a5c6bb3021f33a7bc20a3fb23bff1d 100644 (file)
@@ -184,7 +184,6 @@ func TestDecodeConfigDecimalIsNowPrecision(t *testing.T) {
        conf := testconfig.GetTestConfigs(nil, v).Base.Minify
 
        c.Assert(conf.Tdewolff.CSS.Precision, qt.Equals, 3)
-
 }
 
 // Issue 9456
@@ -209,7 +208,7 @@ func TestDecodeConfigKeepWhitespace(t *testing.T) {
                        KeepDocumentTags:    true,
                        KeepEndTags:         false,
                        KeepQuotes:          false,
-                       KeepWhitespace:      false},
+                       KeepWhitespace:      false,
+               },
        )
-
 }
index fae6a4c0a5c1ae5671c0490ed0821703afcabe00..26117fbcf9ef7f1c3d6e804d4d4b2f024fecec14 100644 (file)
@@ -18,6 +18,7 @@ import (
        "bytes"
        "context"
        "encoding/json"
+       "errors"
        "fmt"
        "io"
        "os"
@@ -46,8 +47,6 @@ import (
 
        "github.com/gohugoio/hugo/common/hugio"
 
-       "errors"
-
        "github.com/spf13/afero"
 )
 
@@ -199,7 +198,7 @@ func (c *Client) Vendor() error {
        if err := c.rmVendorDir(vendorDir); err != nil {
                return err
        }
-       if err := c.fs.MkdirAll(vendorDir, 0755); err != nil {
+       if err := c.fs.MkdirAll(vendorDir, 0o755); err != nil {
                return err
        }
 
@@ -260,7 +259,7 @@ func (c *Client) Vendor() error {
                        } else {
                                targetDir := filepath.Dir(targetFilename)
 
-                               if err := c.fs.MkdirAll(targetDir, 0755); err != nil {
+                               if err := c.fs.MkdirAll(targetDir, 0o755); err != nil {
                                        return fmt.Errorf("failed to make target dir: %w", err)
                                }
 
@@ -303,7 +302,7 @@ func (c *Client) Vendor() error {
        }
 
        if modulesContent.Len() > 0 {
-               if err := afero.WriteFile(c.fs, filepath.Join(vendorDir, vendorModulesFilename), modulesContent.Bytes(), 0666); err != nil {
+               if err := afero.WriteFile(c.fs, filepath.Join(vendorDir, vendorModulesFilename), modulesContent.Bytes(), 0o666); err != nil {
                        return err
                }
        }
@@ -558,7 +557,7 @@ func (c *Client) rewriteGoMod(name string, isGoMod map[string]bool) error {
                return err
        }
        if data != nil {
-               if err := afero.WriteFile(c.fs, filepath.Join(c.ccfg.WorkingDir, name), data, 0666); err != nil {
+               if err := afero.WriteFile(c.fs, filepath.Join(c.ccfg.WorkingDir, name), data, 0o666); err != nil {
                        return err
                }
        }
@@ -636,7 +635,8 @@ func (c *Client) rmVendorDir(vendorDir string) error {
 func (c *Client) runGo(
        ctx context.Context,
        stdout io.Writer,
-       args ...string) error {
+       args ...string,
+) error {
        if c.goBinaryStatus != 0 {
                return nil
        }
index 5c97caaa2ba8b94f06e526809c86160c88f5ab77..6dac14e9a9f7299881c7855391ae399655e92a27 100644 (file)
@@ -100,7 +100,6 @@ lang="en"
                c.Assert(imp.Mounts[1].Source, qt.Equals, "src/markdown/blog")
                c.Assert(imp.Mounts[1].Target, qt.Equals, "content/blog")
                c.Assert(imp.Mounts[1].Lang, qt.Equals, "en")
-
        })
 
        c.Run("Replacements", func(c *qt.C) {
index da963de58922ba102145a70e57629b0a0bc81376..8c7316eeab2b9e5dbe4f2ef39636146f25dc9710 100644 (file)
@@ -25,7 +25,6 @@ import (
 var _ Module = (*moduleAdapter)(nil)
 
 type Module interface {
-
        // Optional config read from the configFilename above.
        Cfg() config.Provider
 
@@ -157,7 +156,6 @@ func (m *moduleAdapter) Time() time.Time {
        }
 
        return *m.gomod.Time
-
 }
 
 func (m *moduleAdapter) Watch() bool {
index ab57231c3b769616acdd8551311fd0ecbb72828f..3ff49cf81438f3d836d6514339a76f50ea2dc3cb 100644 (file)
@@ -78,7 +78,7 @@ func PageMenusFromPage(p Page) (PageMenus, error) {
                return pm, nil
        }
 
-       var wrapErr = func(err error) error {
+       wrapErr := func(err error) error {
                return fmt.Errorf("unable to process menus for page %q: %w", p.Path(), err)
        }
 
@@ -109,7 +109,8 @@ func PageMenusFromPage(p Page) (PageMenus, error) {
 func NewMenuQueryProvider(
        pagem PageMenusGetter,
        sitem MenusGetter,
-       p Page) MenuQueryProvider {
+       p Page,
+) MenuQueryProvider {
        return &pageMenus{
                p:     p,
                pagem: pagem,
index ee299420c5832b8d91c77871d0aa72e32fe1f1dc..f7f3b0c4aa2499f820943ed9b88e7b00bc1610e0 100644 (file)
@@ -41,7 +41,6 @@ func createLayoutExamples() any {
                name string
                d    layouts.LayoutDescriptor
        }{
-
                // Taxonomy layouts.LayoutDescriptor={categories category taxonomy en  false Type Section
                {"Single page in \"posts\" section", layouts.LayoutDescriptor{Kind: "page", Type: "posts", OutputFormatName: "html", Suffix: "html"}},
                {"Base template for single page in \"posts\" section", layouts.LayoutDescriptor{Baseof: true, Kind: "page", Type: "posts", OutputFormatName: "html", Suffix: "html"}},
index 2f340f238ffb0dde4008bb64a53655f1618a779c..b6033247ce25261988a15752c3dc1300dedbbebd 100644 (file)
@@ -953,7 +953,6 @@ func TestLayout(t *testing.T) {
                        }
                })
        }
-
 }
 
 /*
index 13e24af3b329a1eab5f72f10d46ad53cc2b54f06..c86bcd6346112dcafe14bf66535ecb1edf53ab47 100644 (file)
@@ -69,7 +69,6 @@ func TestDefaultTypes(t *testing.T) {
        c.Assert(CalendarFormat.IsHTML, qt.Equals, false)
 
        c.Assert(len(DefaultFormats), qt.Equals, 11)
-
 }
 
 func TestGetFormatByName(t *testing.T) {
index 48def7d124407d4449928798df0eca125deb4ffe..734713c2ef6268006fb295a351fd56036798efbd 100644 (file)
@@ -56,23 +56,26 @@ func TestUnmarshalXML(t *testing.T) {
                                "guid":        "https://example.com/2021/11/30/example-title/",
                                "link":        "https://example.com/2021/11/30/example-title/",
                                "pubDate":     "Tue, 30 Nov 2021 15:00:00 +0000",
-                               "title":       "Example title"},
+                               "title":       "Example title",
+                       },
                        "language":      "en-us",
                        "lastBuildDate": "Fri, 08 Jan 2021 14:44:10 +0000",
                        "link": []any{"https://example.com/", map[string]any{
                                "-href": "https://example.com/feed.xml",
                                "-rel":  "self",
-                               "-type": "application/rss+xml"}},
+                               "-type": "application/rss+xml",
+                       }},
                        "title": "Example feed",
-               }}
+               },
+       }
 
        d := Default
 
        m, err := d.Unmarshal([]byte(xmlDoc), XML)
        c.Assert(err, qt.IsNil)
        c.Assert(m, qt.DeepEquals, expect)
-
 }
+
 func TestUnmarshalToMap(t *testing.T) {
        c := qt.New(t)
 
index 72bb69103b990c70ff1ee151ddf1ad819fdfccbf..36b95e93a8c3b21ed40187ff3a6c9118ac9c7f3d 100644 (file)
@@ -46,5 +46,4 @@ func TestItemValTyped(t *testing.T) {
        c.Assert(Item{low: 0, high: len(source)}.ValTyped(source), qt.Equals, "truex")
        source = []byte("xtrue")
        c.Assert(Item{low: 0, high: len(source)}.ValTyped(source), qt.Equals, "xtrue")
-
 }
index 5b4e0ae55630e89c390e4098b52b6463016e3f62..def2f82c7331008831f60dd8d40f4749b6e0308e 100644 (file)
@@ -22,7 +22,6 @@ type lexerShortcodeState struct {
        elementStepNum     int             // step number in element
        paramElements      int             // number of elements (name + value = 2) found first
        openShortcodes     map[string]bool // set of shortcodes in open state
-
 }
 
 // Shortcode syntax
index 6c01fd8d9cbc1e1fb93d7ff66d84b2c3bcf0f9ee..11a64055007b53f288b3ffb09166e51edf6700df 100644 (file)
@@ -466,7 +466,6 @@ func parseStartTag(s string) string {
        }
 
        return s
-
 }
 
 // isClosedByTag reports whether b ends with a closing tag for tagName.
@@ -523,7 +522,6 @@ LOOP:
        }
 
        return bytes.EqualFold(tagName, b[lo:hi])
-
 }
 
 func isSpace(b byte) bool {
index 3cd834acbacfd299ec74fa20126f6d4b1a0231b5..36447258eb30544d4eff2e7f730c1ae86cc19d1e 100644 (file)
@@ -86,7 +86,8 @@ func TestClassCollector(t *testing.T) {
          }">
     </div>
 </body>`, f("body div", "class1 class2 class3", "")},
-               {"AlpineJS bind 2", `<div x-bind:class="{ 'bg-black':  filter.checked }" class="inline-block mr-1 mb-2 rounded  bg-gray-300 px-2 py-2">FOO</div>`,
+               {
+                       "AlpineJS bind 2", `<div x-bind:class="{ 'bg-black':  filter.checked }" class="inline-block mr-1 mb-2 rounded  bg-gray-300 px-2 py-2">FOO</div>`,
                        f("div", "bg-black bg-gray-300 inline-block mb-2 mr-1 px-2 py-2 rounded", ""),
                },
                {"AlpineJS bind 3", `<div x-bind:class="{ 'text-gray-800':  !checked, 'text-white': checked }"></div>`, f("div", "text-gray-800 text-white", "")},
@@ -130,7 +131,6 @@ func TestClassCollector(t *testing.T) {
 <div id="b" class="foo">d</div>`, f("div form", "foo", "a b")},
                {"Big input, multibyte runes", strings.Repeat(`神真美好 `, rnd.Intn(500)+1) + "<div id=\"神真美好\" class=\"foo\">" + strings.Repeat(`神真美好 `, rnd.Intn(100)+1) + "   <span>神真美好</span>", f("div span", "foo", "神真美好")},
        } {
-
                for _, variant := range []struct {
                        minify bool
                }{
@@ -161,7 +161,6 @@ func TestClassCollector(t *testing.T) {
                        })
                }
        }
-
 }
 
 func TestEndsWithTag(t *testing.T) {
@@ -190,7 +189,6 @@ func TestEndsWithTag(t *testing.T) {
                        c.Assert(got, qt.Equals, test.expect)
                })
        }
-
 }
 
 func BenchmarkElementsCollectorWriter(b *testing.B) {
@@ -276,6 +274,5 @@ func BenchmarkElementsCollectorWriterPre(b *testing.B) {
        ))
        for i := 0; i < b.N; i++ {
                fmt.Fprint(w, benchHTML)
-
        }
 }
index 72b2f3252ddfbf859cfafac9b5ebd1460b8b0213..f1d8e11a14a2bb625a9817808f4c3af51bf004ea 100644 (file)
@@ -118,7 +118,6 @@ func TestCardinalityThreshold(t *testing.T) {
        c.Assert(hasKeyword("tags", "b"), qt.Equals, false)
        c.Assert(hasKeyword("tags", "d"), qt.Equals, true)
        c.Assert(hasKeyword("keywords", "b"), qt.Equals, true)
-
 }
 
 func TestSearch(t *testing.T) {
index fe891fe8832013dc1c0ebc917b8722f5708f586f..71872a30e4d77ea3367b85a1b27a68cc972c4887 100644 (file)
@@ -50,7 +50,6 @@ func ColorToHexString(c color.Color) string {
        r, g, b, a := c.RGBA()
        rgba := color.RGBA{uint8(r), uint8(g), uint8(b), uint8(a)}
        return fmt.Sprintf("#%.2x%.2x%.2x", rgba.R, rgba.G, rgba.B)
-
 }
 
 func hexStringToColor(s string) (color.Color, error) {
index 2108d51c29022fd6619aaa7f64349b1a8c1a224e..c27a2e9b22a71ba67b45e4b3e6fd024b01535048 100644 (file)
@@ -28,8 +28,7 @@ func TestPageMatcher(t *testing.T) {
        developmentTestSite := testSite{h: hugo.NewInfo(testConfig{environment: "development"}, nil)}
        productionTestSite := testSite{h: hugo.NewInfo(testConfig{environment: "production"}, nil)}
 
-       p1, p2, p3 :=
-               &testPage{path: "/p1", kind: "section", lang: "en", site: developmentTestSite},
+       p1, p2, p3 := &testPage{path: "/p1", kind: "section", lang: "en", site: developmentTestSite},
                &testPage{path: "p2", kind: "page", lang: "no", site: productionTestSite},
                &testPage{path: "p3", kind: "page", lang: "en"}
 
@@ -154,7 +153,6 @@ func TestDecodeCascadeConfig(t *testing.T) {
        got, err = DecodeCascadeConfig(nil)
        c.Assert(err, qt.IsNil)
        c.Assert(got, qt.IsNotNil)
-
 }
 
 type testConfig struct {
index a443a063394cfaff4005b5400d4e111f5270df66..21314ad342866ed3b53ab5b1a22841fc1df1869a 100644 (file)
@@ -81,7 +81,6 @@ func TestDecodeRemoteOptions(t *testing.T) {
                        c.Assert(err, isErr)
                        c.Assert(got, qt.DeepEquals, test.want)
                })
-
        }
 }
 
@@ -114,7 +113,6 @@ func TestOptionsNewRequest(t *testing.T) {
        c.Assert(err, qt.IsNil)
        c.Assert(req.Method, qt.Equals, "GET")
        c.Assert(req.Header["User-Agent"], qt.DeepEquals, []string{"foo"})
-
 }
 
 func TestCalculateResourceID(t *testing.T) {
index c370a1cc88b19081eba6e2a57b8f72e2fa8bf0c4..dd4c1e5cae3afb80311fe72ec62896b83aea7bbf 100644 (file)
@@ -293,7 +293,6 @@ T1: {{ $r.Content }}
 
        b.AssertLogMatches(`Dart Sass: foo`)
        b.AssertLogMatches(`Dart Sass: .*assets.*main.scss:1:0: bar`)
-
 }
 
 func TestTransformErrors(t *testing.T) {
@@ -347,7 +346,6 @@ T1: {{ $r.Content }}
                b.Assert(fe.ErrorContext(), qt.IsNotNil)
                b.Assert(fe.ErrorContext().Lines, qt.DeepEquals, []string{"  $maincolor #eee;", "", "body {", "\tcolor: $maincolor;", "}"})
                b.Assert(fe.ErrorContext().ChromaLexer, qt.Equals, "scss")
-
        })
 
        c.Run("error in import", func(c *qt.C) {
@@ -365,9 +363,7 @@ T1: {{ $r.Content }}
                b.Assert(fe.ErrorContext(), qt.IsNotNil)
                b.Assert(fe.ErrorContext().Lines, qt.DeepEquals, []string{"/* comment line 1 */", "$foocolor #ccc;", "", "foo {"})
                b.Assert(fe.ErrorContext().ChromaLexer, qt.Equals, "scss")
-
        })
-
 }
 
 func TestOptionVars(t *testing.T) {
@@ -528,5 +524,4 @@ T1: {{ $r.Content }}
        b.AssertLogMatches(`Dart Sass: .*assets.*main.scss:12:0: number`)
        b.AssertLogMatches(`Dart Sass: .*assets.*main.scss:13:0: number`)
        b.AssertLogMatches(`Dart Sass: .*assets.*main.scss:14:0: number`)
-
 }
index bfee39499d16e9dd69acc2913da66abf6cdffad0..c9b347c4cf41ed50578ff59e61235481362104eb 100644 (file)
@@ -47,7 +47,6 @@ func (c *Client) ToCSS(res resources.ResourceTransformer, opts Options) (resourc
        }
 
        return res.Transform(&toCSSTransformation{c: c, options: internalOptions})
-
 }
 
 type toCSSTransformation struct {
index d0dd65e20caaa5874570813255467607d979323b..4d7d9d710abe555bb2f5dabbcb16da96f7a3e5be 100644 (file)
@@ -228,7 +228,6 @@ T1: {{ $r.Content }}
                b.Assert(fe.ErrorContext(), qt.IsNotNil)
                b.Assert(fe.ErrorContext().Lines, qt.DeepEquals, []string{"/* comment line 4 */", "", "$maincolor #eee;", "", "body {"})
                b.Assert(fe.ErrorContext().ChromaLexer, qt.Equals, "scss")
-
        })
 
        c.Run("error in import", func(c *qt.C) {
@@ -245,9 +244,7 @@ T1: {{ $r.Content }}
                b.Assert(fe.ErrorContext(), qt.IsNotNil)
                b.Assert(fe.ErrorContext().Lines, qt.DeepEquals, []string{"/* comment line 1 */", "$foocolor #ccc;", "", "foo {"})
                b.Assert(fe.ErrorContext().ChromaLexer, qt.Equals, "scss")
-
        })
-
 }
 
 func TestOptionVars(t *testing.T) {
index 535697f9e38874d7db312e39ab9424b6f20fc245..1999ddc0ab08289bad81e5c214b8f4679b19d6bc 100644 (file)
@@ -26,8 +26,7 @@ func New() *Namespace {
 }
 
 // Namespace provides template functions for the "cast" namespace.
-type Namespace struct {
-}
+type Namespace struct{}
 
 // ToInt converts v to an int.
 func (ns *Namespace) ToInt(v any) (int, error) {
index c6aa50ebacad72d2ffbc5b565d07a3bf78b9feb6..8c019e412a1991df25ad65f69434f19ac91934fa 100644 (file)
 package collections
 
 import (
+       "errors"
        "fmt"
        "reflect"
        "strings"
 
        "github.com/gohugoio/hugo/common/hreflect"
        "github.com/gohugoio/hugo/common/maps"
-
-       "errors"
 )
 
 // Merge creates a copy of the final parameter in params and merges the preceding
index a295441ecdb768ed9b40f50528b96c645c42b902..56909d30e208ed5898131c3c7441b8eb1e5639b9 100644 (file)
 package collections
 
 import (
+       "errors"
        "fmt"
        "reflect"
 
-       "errors"
-
        "github.com/mitchellh/hashstructure"
 )
 
index 08d8963c5dc8daf0f9c8132de7888f1c63c3333e..7ec9572e05e57d124687dc1f7735e11a55ce1af3 100644 (file)
@@ -876,7 +876,7 @@ func BenchmarkWhereOps(b *testing.B) {
                j := rand.Intn(i + 1)
                seq[i], seq[j] = seq[j], seq[i]
        }
-       //results, err = ns.Where(context.Background(), test.seq, test.key, test.op, test.match)
+       // results, err = ns.Where(context.Background(), test.seq, test.key, test.op, test.match)
        runOps := func(b *testing.B, op, match string) {
                _, err := ns.Where(ctx, seq, "foo", op, match)
                if err != nil {
@@ -901,5 +901,4 @@ func BenchmarkWhereOps(b *testing.B) {
                        runOps(b, "like", "^bar")
                }
        })
-
 }
index c721d401b6b90ca5bf060fc1e15e6b441ad6c201..412a192128bdcabc627a8fbba676ee6074e4e492 100644 (file)
@@ -118,7 +118,7 @@ func (ns *Namespace) HMAC(h any, k any, m any, e ...any) (string, error) {
                return "", err
        }
 
-       var encoding = "hex"
+       encoding := "hex"
        if len(e) > 0 && e[0] != nil {
                encoding, err = cast.ToStringE(e[0])
                if err != nil {
@@ -134,5 +134,4 @@ func (ns *Namespace) HMAC(h any, k any, m any, e ...any) (string, error) {
        default:
                return "", fmt.Errorf("%q is not a supported encoding method", encoding)
        }
-
 }
index 5fc6130119285ea66f16074d713ef1ad4fa72771..51fa1d518549e8593a3088861bfc73c8b6c2c5f2 100644 (file)
@@ -12,8 +12,7 @@ import (
 const name = "css"
 
 // Namespace provides template functions for the "css" namespace.
-type Namespace struct {
-}
+type Namespace struct{}
 
 // Quoted returns a string that needs to be quoted in CSS.
 func (ns *Namespace) Quoted(v any) css.QuotedString {
index c51dbbd8231e47bb2ba676825bc130fe7b07dd2c..7c49d80763ccdfa6bde3625964ec9d9453c4b363 100644 (file)
@@ -72,7 +72,6 @@ func TestGetCSV(t *testing.T) {
                        false,
                },
        } {
-
                c.Run(test.url, func(c *qt.C) {
                        msg := qt.Commentf("Test %d", i)
 
@@ -119,7 +118,6 @@ func TestGetCSV(t *testing.T) {
                        c.Assert(got, qt.Not(qt.IsNil), msg)
                        c.Assert(got, qt.DeepEquals, test.expect, msg)
                })
-
        }
 }
 
@@ -164,9 +162,7 @@ func TestGetJSON(t *testing.T) {
                        map[string]any{"gomeetup": []any{"Sydney", "San Francisco", "Stockholm"}},
                },
        } {
-
                c.Run(test.url, func(c *qt.C) {
-
                        msg := qt.Commentf("Test %d", i)
                        ns := newTestNs()
 
@@ -208,7 +204,6 @@ func TestGetJSON(t *testing.T) {
                        c.Assert(int(ns.deps.Log.LoggCount(logg.LevelError)), qt.Equals, 0, msg)
                        c.Assert(got, qt.Not(qt.IsNil), msg)
                        c.Assert(got, qt.DeepEquals, test.expect)
-
                })
        }
 }
@@ -263,9 +258,7 @@ func TestHeaders(t *testing.T) {
                        },
                },
        } {
-
                c.Run(test.name, func(c *qt.C) {
-
                        ns := newTestNs()
 
                        // Setup HTTP test server
@@ -275,7 +268,6 @@ func TestHeaders(t *testing.T) {
                                c.Assert(r.URL.String(), qt.Equals, "http://gohugo.io/api?foo")
                                w.Write([]byte("{}"))
                                r.Header.Write(&headers)
-
                        })
                        defer func() { srv.Close() }()
 
@@ -296,9 +288,7 @@ func TestHeaders(t *testing.T) {
                                _, err := ns.GetCSV(",", args...)
                                return err
                        })
-
                })
-
        }
 }
 
index 82510aaa3b23f8b56c0c38db11daf825496f7db0..02ffb333fa97a0dc378ff5ae66be420d2e514eb0 100644 (file)
 package images
 
 import (
+       "errors"
        "image"
        "sync"
 
-       "errors"
-
        "github.com/bep/overlayfs"
        "github.com/gohugoio/hugo/resources/images"
 
index 1b70b7c70a144b944641aa3c8af321f494a02c7c..4f656d1f940db5afcdb766093358254e97db59e2 100644 (file)
@@ -101,7 +101,7 @@ func TestNSConfig(t *testing.T) {
                // cast path to string for afero.WriteFile
                sp, err := cast.ToStringE(test.path)
                c.Assert(err, qt.IsNil)
-               afero.WriteFile(ns.deps.Fs.Source, filepath.Join(bcfg.WorkingDir(), sp), test.input, 0755)
+               afero.WriteFile(ns.deps.Fs.Source, filepath.Join(bcfg.WorkingDir(), sp), test.input, 0o755)
 
                result, err := ns.Config(test.path)
 
index 8609bf34a62e85ae2eb1858de084b9054365e4e2..5d837f961201eb128f2b9f7da4248532cbcfe070 100644 (file)
@@ -20,8 +20,7 @@ import (
        qt "github.com/frankban/quicktest"
 )
 
-type Test struct {
-}
+type Test struct{}
 
 func (t *Test) MyTestMethod() string {
        return "abcde"
index 0f8db11e2a878ca98c3e0e0430d921f1018ac4c5..3368f6b7339954b84857e58ba651c0caa91abb5e 100644 (file)
@@ -215,7 +215,6 @@ func (ns *Namespace) applyOpToScalarsOrSlices(opName string, op func(x, y float6
                return
        }
        return
-
 }
 
 func (ns *Namespace) toFloatsE(v any) ([]float64, bool, error) {
index 59add2152dab1edd079c898a5af42dabb7beb75f..3ae89c69986aecae7031e6e92839de42197d2a3e 100644 (file)
@@ -154,7 +154,6 @@ func (ns *Namespace) Join(elements ...any) (string, error) {
 // extraneous slashes are removed.
 func (ns *Namespace) Clean(path any) (string, error) {
        spath, err := cast.ToStringE(path)
-
        if err != nil {
                return "", err
        }
index df323c2161649e525ad4571828773962689fb4a9..cf0306556345da8ea6535175dcea1a691cebcec0 100644 (file)
@@ -70,7 +70,6 @@ func (ns *Namespace) FindRESubmatch(expr string, content any, limit ...any) ([][
        }
 
        return re.FindAllStringSubmatch(conv, n), nil
-
 }
 
 // ReplaceRE returns a copy of s, replacing all matches of the regular
index b6ec5cb9ed5d425e1997a88bbf2a90631020354e..f0735fbc2fc6c70f76589ebdaf362591a0aacfea 100644 (file)
@@ -83,6 +83,7 @@ func TestFindRESubmatch(t *testing.T) {
                c.Check(result, qt.DeepEquals, test.expect)
        }
 }
+
 func TestReplaceRE(t *testing.T) {
        t.Parallel()
        c := qt.New(t)
index e2339aa2739b46b8e1b77587c807f5300939d1ba..d307d786d08380c8753aeee627ee521d3a189e6e 100644 (file)
@@ -111,5 +111,4 @@ func BenchmarkTruncate(b *testing.B) {
                        ns.Truncate(10, "I have a <a href='/markdown'>Markdown link</a> inside")
                }
        })
-
 }
index 9001f6b6b4b0ad754941eca2e181b653d6019147..b13e629296458bd0463b1ad9766f0079456d59a9 100644 (file)
@@ -124,7 +124,7 @@ func TestFormat(t *testing.T) {
                }
        })
 
-       //Issue #9084
+       // Issue #9084
        c.Run("TZ America/Los_Angeles", func(c *qt.C) {
                c.Parallel()
 
@@ -136,9 +136,7 @@ func TestFormat(t *testing.T) {
 
                c.Assert(err, qt.IsNil)
                c.Assert(d, qt.Equals, "11:00:00 am Pacific Daylight Time")
-
        })
-
 }
 
 func TestDuration(t *testing.T) {
index 938fc74e23eb28f16bd219af7fc9ca64e61a2d2b..a1e7b463ecc66158b492db7d9f297d50e70df373 100644 (file)
@@ -23,7 +23,6 @@ import (
 const numTemplateVariants = 3
 
 type shortcodeVariant struct {
-
        // The possible variants: lang, outFormat, suffix
        // gtag
        // gtag.html
index 0ad54bb961a6757c6d2c5dbc4edf66cc05dd611b..2fbdacd2d02c18380430352e7b3db3ffdc5ed8f8 100644 (file)
@@ -2,9 +2,8 @@ package transform
 
 import (
        "bytes"
-       "strings"
-
        "errors"
+       "strings"
 
        "github.com/gohugoio/hugo/parser"
        "github.com/gohugoio/hugo/parser/metadecoders"
index b06b562a724f227c1920d16af5fe4da158e1e296..6c4681a0ca8fe2ec2972e4bb7b126123a46e493e 100644 (file)
@@ -189,7 +189,6 @@ func (ns *Namespace) AbsLangURL(s any) (string, error) {
 // of any ./ or ../ elements. If the argument list is empty, JoinPath returns
 // an empty string.
 func (ns *Namespace) JoinPath(elements ...any) (string, error) {
-
        if len(elements) == 0 {
                return "", nil
        }
index 3bde73bd81ed1d0eda70bce6a00bc69105b12521..cedb5d07970e4b88cd0bd1828210bda7d3225f8f 100644 (file)
@@ -248,7 +248,6 @@ func newItemToWatch(filename string) (*itemToWatch, error) {
        }
 
        return &itemToWatch{filename: filename, left: r}, nil
-
 }
 
 func (item *itemToWatch) checkForChanges() ([]fsnotify.Event, error) {
@@ -298,7 +297,6 @@ func (item *itemToWatch) checkForChanges() ([]fsnotify.Event, error) {
        }
 
        return evs, nil
-
 }
 
 func checkChange(fi1, fi2 os.FileInfo) fsnotify.Op {