chore: Update tools

twpayne · twpayne · commit 57705baac6b3 · 2025-09-23T22:17:06.000+02:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,11 +17,11 @@ env:
   AGE_VERSION: 1.2.1 # https://github.com/FiloSottile/age/releases
   CHOCOLATEY_VERSION: 2.5.1 # https://github.com/chocolatey/choco/releases
   GO_VERSION: 1.25.1 # https://go.dev/doc/devel/release
-  GOLANGCI_LINT_VERSION: 2.4.0 # https://github.com/golangci/golangci-lint/releases
-  GORELEASER_VERSION: 2.12.1 # https://github.com/goreleaser/goreleaser/releases
+  GOLANGCI_LINT_VERSION: 2.5.0 # https://github.com/golangci/golangci-lint/releases
+  GORELEASER_VERSION: 2.12.2 # https://github.com/goreleaser/goreleaser/releases
   PYTHON_VERSION: '3.10' # https://www.python.org/downloads/
   RAGE_VERSION: 0.11.1 # https://github.com/str4d/rage/releases
-  UV_VERSION: 0.8.17 # https://github.com/astral-sh/uv/releases
+  UV_VERSION: 0.8.21 # https://github.com/astral-sh/uv/releases
 jobs:
   changes:
     runs-on: ubuntu-22.04
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,6 +1,6 @@
 version: '2'
 run:
-  go: '1.24'
+  go: '1.25'
 linters:
   enable:
   - asciicheck
@@ -26,6 +26,7 @@ linters:
   - gocheckcompilerdirectives
   - gochecksumtype
   - gocritic
+  - godoclint
   - godot
   - gomodguard
   - goprintffuncname
@@ -36,6 +37,7 @@ linters:
   - inamedparam
   - interfacebloat
   - intrange
+  - iotamixing
   - loggercheck
   - makezero
   - mirror
@@ -61,6 +63,7 @@ linters:
   - thelper
   - unconvert
   - unparam
+  - unqueryvet
   - usestdlibvars
   - usetesting
   - wastedassign
@@ -121,6 +124,10 @@ linters:
       - rangeValCopy
       - unnamedResult
       - whyNoLint
+    godoclint:
+      default: all
+      disable:
+      - require-doc
     govet:
       disable:
       - fieldalignment
@@ -154,6 +161,8 @@ linters:
         disabled: true
       - name: import-shadowing
         disabled: true
+      - name: identical-switch-branches
+        disabled: true
       - name: line-length-limit
         disabled: true
       - name: max-control-nesting
@@ -162,10 +171,14 @@ linters:
         disabled: true
       - name: nested-structs
         disabled: true
+      - name: unhandled-error
+        disabled: true
       - name: unused-parameter
         disabled: true
       - name: unused-receiver
         disabled: true
+      - name: useless-fallthrough
+        disabled: true
     staticcheck:
       checks:
       - all
@@ -178,6 +191,9 @@ linters:
     - legacy
     - std-error-handling
     rules:
+    - linters:
+      - godoclint
+      path: internal/chezmoi/chezmoi_windows.go # https://github.com/godoc-lint/godoc-lint/issues/56
     - linters:
       - err113
       text: do not define dynamic errors, use wrapped static errors instead
diff --git a/internal/chezmoi/abspath.go b/internal/chezmoi/abspath.go
@@ -160,8 +160,9 @@ func HomeDirAbsPath() (AbsPath, error) {
 	return absPath, nil
 }
 
-// StringToAbsPathHookFunc is a github.com/go-viper/mapstructure/v2.DecodeHookFunc
-// that parses an AbsPath from a string.
+// StringToAbsPathHookFunc is a
+// github.com/go-viper/mapstructure/v2.DecodeHookFunc that parses an AbsPath
+// from a string.
 func StringToAbsPathHookFunc() mapstructure.DecodeHookFunc {
 	return func(from, to reflect.Type, data any) (any, error) {
 		if to != reflect.TypeOf(EmptyAbsPath) {
diff --git a/internal/chezmoi/chezmoi_windows.go b/internal/chezmoi/chezmoi_windows.go
@@ -28,8 +28,8 @@ func findExecutableExtensions(path string) []string {
 	return result
 }
 
-// IsExecutable checks if the file is a regular file and has an extension listed
-// in the PATHEXT environment variable as per
+// IsExecutable checks if the file is a regular file and has an
+// extension listed in the PATHEXT environment variable as per
 // https://www.nextofwindows.com/what-is-pathext-environment-variable-in-windows.
 func IsExecutable(fileInfo fs.FileInfo) bool {
 	if fileInfo.Mode().Perm()&0o111 != 0 {
diff --git a/internal/chezmoi/debugsystem.go b/internal/chezmoi/debugsystem.go
@@ -17,7 +17,8 @@ type DebugSystem struct {
 	system System
 }
 
-// NewDebugSystem returns a new DebugSystem that logs methods on system to logger.
+// NewDebugSystem returns a new DebugSystem that logs methods on system to
+// logger.
 func NewDebugSystem(system System, logger *slog.Logger) *DebugSystem {
 	return &DebugSystem{
 		logger: logger,
diff --git a/internal/chezmoi/entrytypeset.go b/internal/chezmoi/entrytypeset.go
@@ -343,8 +343,8 @@ func (s *EntryTypeSet) Type() string {
 }
 
 // StringSliceToEntryTypeSetHookFunc is a
-// github.com/go-viper/mapstructure/v2.DecodeHookFunc that parses an EntryTypeSet
-// from a []string.
+// github.com/go-viper/mapstructure/v2.DecodeHookFunc that parses an
+// EntryTypeSet from a []string.
 func StringSliceToEntryTypeSetHookFunc() mapstructure.DecodeHookFunc {
 	return func(from, to reflect.Type, data any) (any, error) {
 		if to != reflect.TypeOf(EntryTypeSet{}) {
diff --git a/internal/chezmoi/gpgencryption.go b/internal/chezmoi/gpgencryption.go
@@ -10,7 +10,8 @@ import (
 	"chezmoi.io/chezmoi/internal/chezmoilog"
 )
 
-// A GPGEncryption uses gpg for encryption and decryption. See https://gnupg.org/.
+// A GPGEncryption uses gpg for encryption and decryption. See
+// https://gnupg.org/.
 type GPGEncryption struct {
 	Command    string   `json:"command"    mapstructure:"command"    yaml:"command"`
 	Args       []string `json:"args"       mapstructure:"args"       yaml:"args"`
diff --git a/internal/chezmoi/hexbytes.go b/internal/chezmoi/hexbytes.go
@@ -46,7 +46,8 @@ func (h *HexBytes) UnmarshalText(text []byte) error {
 	return nil
 }
 
-// UnmarshalYAML implements github.com/goccy/go-yaml.BytesUnmarshaler.UnmarshalYAML.
+// UnmarshalYAML implements
+// github.com/goccy/go-yaml.BytesUnmarshaler.UnmarshalYAML.
 func (h *HexBytes) UnmarshalYAML(data []byte) error {
 	s, err := strconv.Unquote(string(data))
 	if err != nil {
diff --git a/internal/chezmoi/persistentstate.go b/internal/chezmoi/persistentstate.go
@@ -59,7 +59,8 @@ func PersistentStateData(s PersistentState, buckets map[string][]byte) (map[stri
 	return result, nil
 }
 
-// PersistentStateGet gets the value associated with key in bucket in s, if it exists.
+// PersistentStateGet gets the value associated with key in bucket in s, if it
+// exists.
 func PersistentStateGet(s PersistentState, bucket, key []byte, value any) (bool, error) {
 	data, err := s.Get(bucket, key)
 	if err != nil {
diff --git a/internal/chezmoi/realsystem_unix.go b/internal/chezmoi/realsystem_unix.go
@@ -32,7 +32,8 @@ func RealSystemWithSafe(safe bool) RealSystemOption {
 	}
 }
 
-// RealSystemWithScriptTempDir sets the script temporary directory of the RealSystem.
+// RealSystemWithScriptTempDir sets the script temporary directory of the
+// RealSystem.
 func RealSystemWithScriptTempDir(scriptTempDir AbsPath) RealSystemOption {
 	return func(s *RealSystem) {
 		s.scriptTempDir = scriptTempDir
diff --git a/internal/chezmoi/realsystem_windows.go b/internal/chezmoi/realsystem_windows.go
@@ -24,7 +24,8 @@ func RealSystemWithSafe(safe bool) RealSystemOption {
 	return func(s *RealSystem) {}
 }
 
-// RealSystemWithScriptTempDir sets the script temporary directory of the RealSystem.
+// RealSystemWithScriptTempDir sets the script temporary directory of the
+// RealSystem.
 func RealSystemWithScriptTempDir(scriptTempDir AbsPath) RealSystemOption {
 	return func(s *RealSystem) {}
 }
diff --git a/internal/chezmoi/sourcestate.go b/internal/chezmoi/sourcestate.go
@@ -1474,7 +1474,8 @@ func (s *SourceState) addTemplateData(sourceAbsPath AbsPath) error {
 	return nil
 }
 
-// addTemplateDataDir adds all template data in the directory sourceAbsPath to s.
+// addTemplateDataDir adds all template data in the directory sourceAbsPath to
+// s.
 func (s *SourceState) addTemplateDataDir(sourceAbsPath AbsPath, fileInfo fs.FileInfo) error {
 	walkFunc := func(dataAbsPath AbsPath, fileInfo fs.FileInfo, err error) error {
 		if dataAbsPath == sourceAbsPath {
@@ -2180,7 +2181,8 @@ func (s *SourceState) newSourceStateFile(
 	}
 }
 
-// newSourceStateDirEntry returns a SourceStateEntry constructed from a directory in s.
+// newSourceStateDirEntry returns a SourceStateEntry constructed from a
+// directory in s.
 func (s *SourceState) newSourceStateDirEntry(
 	actualStateDir *ActualStateDir,
 	fileInfo fs.FileInfo,
@@ -2314,7 +2316,8 @@ func (s *SourceState) newSourceStateFileEntryFromSymlink(
 	}, nil
 }
 
-// populateImplicitParentDirs creates implicit parent directories for externalRelPath.
+// populateImplicitParentDirs creates implicit parent directories for
+// externalRelPath.
 func (s *SourceState) populateImplicitParentDirs(
 	externalRelPath RelPath,
 	external *External,
diff --git a/internal/chezmoilog/chezmoilog.go b/internal/chezmoilog/chezmoilog.go
@@ -138,7 +138,8 @@ func LogHTTPRequest(ctx context.Context, logger *slog.Logger, client *http.Clien
 	return resp, err
 }
 
-// LogCmdCombinedOutput calls cmd.CombinedOutput, logs the result, and returns the result.
+// LogCmdCombinedOutput calls cmd.CombinedOutput, logs the result, and returns
+// the result.
 func LogCmdCombinedOutput(logger *slog.Logger, cmd *exec.Cmd) ([]byte, error) {
 	start := time.Now()
 	combinedOutput, err := cmd.CombinedOutput()
diff --git a/internal/cmd/cmd.go b/internal/cmd/cmd.go
@@ -65,8 +65,8 @@ func Main(versionInfo VersionInfo, args []string) int {
 	return 0
 }
 
-// deDuplicateError returns err's human-readable string with duplicate components
-// removed.
+// deDuplicateError returns err's human-readable string with duplicate
+// components removed.
 func deDuplicateError(err error) string {
 	components := deDuplicateErrorRx.Split(err.Error(), -1)
 	seenComponents := chezmoiset.NewWithCapacity[string](len(components))
diff --git a/internal/cmd/config.go b/internal/cmd/config.go
@@ -727,8 +727,8 @@ func (c *Config) applyArgs(
 	return nil
 }
 
-// builtinDiffFile outputs the diff between fromData and fromMode and toData and toMode
-// at path.
+// builtinDiffFile outputs the diff between fromData and fromMode and toData and
+// toMode at path.
 func (c *Config) builtinDiffFile(
 	relPath chezmoi.RelPath,
 	fromData []byte, fromMode fs.FileMode,
diff --git a/internal/cmd/gopasstemplatefuncs.go b/internal/cmd/gopasstemplatefuncs.go
@@ -24,9 +24,7 @@ const (
 )
 
 var (
-	// chezmoi uses gopass show --password which was added in
-	// https://github.com/gopasspw/gopass/commit/8fa13d84e3656cfc4ee6717f5f485c9e471ad996
-	// and the first tag containing that commit is v1.6.1.
+	// chezmoi uses gopass show --password which was added in v1.6.1.
 	gopassMinVersion  = semver.Version{Major: 1, Minor: 6, Patch: 1}
 	gopassVersionArgs = []string{"--version"}
 	gopassVersionRx   = regexp.MustCompile(`gopass\s+(\d+\.\d+\.\d+)`)
diff --git a/internal/cmd/keepassxctemplatefuncs.go b/internal/cmd/keepassxctemplatefuncs.go
@@ -385,7 +385,8 @@ func (c *Config) keepassxcBuiltinExtractValues(
 	return keepassxcBuiltinBuildCache(db, "", db.Content.Root.Groups[0].Groups, nil, entry, mapper)
 }
 
-// keepassxcBuiltinBuildCache build the builtin cache using a given mapper function.
+// keepassxcBuiltinBuildCache build the builtin cache using a given mapper
+// function.
 func keepassxcBuiltinBuildCache(
 	db *gokeepasslib.Database,
 	path string,
diff --git a/internal/cmd/lastpasstemplatefuncs.go b/internal/cmd/lastpasstemplatefuncs.go
@@ -15,9 +15,7 @@ import (
 )
 
 var (
-	// chezmoi uses lpass show --json which was added in
-	// https://github.com/lastpass/lastpass-cli/commit/e5a22e2eeef31ab6c54595616e0f57ca0a1c162d
-	// and the first tag containing that commit is v1.3.0~6.
+	// chezmoi uses lpass show --json which was added in v1.3.0~6.
 	lastpassMinVersion  = semver.Version{Major: 1, Minor: 3, Patch: 0}
 	lastpassParseNoteRx = regexp.MustCompile(`\A([ A-Za-z]*):(.*)(?:\r?\n)?\z`)
 	lastpassVersionArgs = []string{"--version"}
diff --git a/internal/cmd/main_test.go b/internal/cmd/main_test.go
@@ -325,7 +325,8 @@ func cmdIsSymlink(ts *testscript.TestScript, neg bool, args []string) {
 	}
 }
 
-// cmdLExists succeeds if all if its arguments exist, without following symlinks.
+// cmdLExists succeeds if all if its arguments exist, without following
+// symlinks.
 func cmdLExists(ts *testscript.TestScript, neg bool, args []string) {
 	if len(args) == 0 {
 		ts.Fatalf("usage: exists file...")
diff --git a/internal/cmd/prompt.go b/internal/cmd/prompt.go
@@ -251,7 +251,8 @@ func (c *Config) promptBool(prompt string, args ...bool) (bool, error) {
 	return c.readBool(prompt, defaultValue)
 }
 
-// promptChoice prompts the user for one of choices until a valid choice is made.
+// promptChoice prompts the user for one of choices until a valid choice is
+// made.
 func (c *Config) promptChoice(prompt string, choices []string, args ...string) (string, error) {
 	var defaultValue *string
 	switch len(args) {
diff --git a/internal/cmd/templatefuncs.go b/internal/cmd/templatefuncs.go
@@ -41,7 +41,8 @@ func (e emptyPathElementError) Error() string {
 	return fmt.Sprintf("empty path element at index %d", e.index)
 }
 
-// An invalidPathElementTypeError is returned when an element in a path has an invalid type.
+// An invalidPathElementTypeError is returned when an element in a path has an
+// invalid type.
 type invalidPathElementTypeError struct {
 	element any
 }
diff --git a/internal/cmd/upgradecmd_windows.go b/internal/cmd/upgradecmd_windows.go
@@ -36,7 +36,8 @@ func (c *Config) brewUpgrade() error {
 	return errUnsupportedUpgradeMethod
 }
 
-// isWinGetInstall determines if executableAbsPath contains a WinGet installation path.
+// isWinGetInstall determines if executableAbsPath contains a WinGet
+// installation path.
 func isWinGetInstall(fileSystem vfs.Stater, executableAbsPath string) (bool, error) {
 	realExecutableAbsPath := executableAbsPath
 	fi, err := os.Lstat(executableAbsPath)
diff --git a/internal/cmd/util.go b/internal/cmd/util.go
@@ -72,8 +72,8 @@ func englishList(ss []string) string {
 	}
 }
 
-// englishListWithNoun returns ss formatted as an English list, including an Oxford
-// comma.
+// englishListWithNoun returns ss formatted as an English list, including an
+// Oxford comma.
 func englishListWithNoun(ss []string, singular, plural string) string {
 	if len(ss) == 1 {
 		return ss[0] + " " + singular
diff --git a/internal/cmds/generate-install.sh/main.go b/internal/cmds/generate-install.sh/main.go
@@ -1,4 +1,5 @@
-// generate-install.sh generates assets/scripts/install.sh and assets/scripts/install-local-bin.sh.
+// generate-install.sh generates assets/scripts/install.sh and
+// assets/scripts/install-local-bin.sh.
 package main
 
 import (

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ type DebugSystem struct {`
`17`	`17`	`system System`
`18`	`18`	`}`
`19`	`19`
`20`		`-// NewDebugSystem returns a new DebugSystem that logs methods on system to logger.`
	`20`	`+// NewDebugSystem returns a new DebugSystem that logs methods on system to`
	`21`	`+// logger.`
`21`	`22`	`func NewDebugSystem(system System, logger slog.Logger) DebugSystem {`
`22`	`23`	`return &DebugSystem{`
`23`	`24`	`logger: logger,`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ import (`
`10`	`10`	`"chezmoi.io/chezmoi/internal/chezmoilog"`
`11`	`11`	`)`
`12`	`12`
`13`		`-// A GPGEncryption uses gpg for encryption and decryption. See https://gnupg.org/.`
	`13`	`+// A GPGEncryption uses gpg for encryption and decryption. See`
	`14`	`+// https://gnupg.org/.`
`14`	`15`	`type GPGEncryption struct {`
`15`	`16`	Command string `json:"command" mapstructure:"command" yaml:"command"`
`16`	`17`	Args []string `json:"args" mapstructure:"args" yaml:"args"`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ func (h *HexBytes) UnmarshalText(text []byte) error {`
`46`	`46`	`return nil`
`47`	`47`	`}`
`48`	`48`
`49`		`-// UnmarshalYAML implements github.com/goccy/go-yaml.BytesUnmarshaler.UnmarshalYAML.`
	`49`	`+// UnmarshalYAML implements`
	`50`	`+// github.com/goccy/go-yaml.BytesUnmarshaler.UnmarshalYAML.`
`50`	`51`	`func (h *HexBytes) UnmarshalYAML(data []byte) error {`
`51`	`52`	`s, err := strconv.Unquote(string(data))`
`52`	`53`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ func PersistentStateData(s PersistentState, buckets map[string][]byte) (map[stri`
`59`	`59`	`return result, nil`
`60`	`60`	`}`
`61`	`61`
`62`		`-// PersistentStateGet gets the value associated with key in bucket in s, if it exists.`
	`62`	`+// PersistentStateGet gets the value associated with key in bucket in s, if it`
	`63`	`+// exists.`
`63`	`64`	`func PersistentStateGet(s PersistentState, bucket, key []byte, value any) (bool, error) {`
`64`	`65`	`data, err := s.Get(bucket, key)`
`65`	`66`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ func RealSystemWithSafe(safe bool) RealSystemOption {`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`-// RealSystemWithScriptTempDir sets the script temporary directory of the RealSystem.`
	`35`	`+// RealSystemWithScriptTempDir sets the script temporary directory of the`
	`36`	`+// RealSystem.`
`36`	`37`	`func RealSystemWithScriptTempDir(scriptTempDir AbsPath) RealSystemOption {`
`37`	`38`	`return func(s *RealSystem) {`
`38`	`39`	`s.scriptTempDir = scriptTempDir`