chore: update CI

Author: ldez

.github/workflows/ci.yml

@@ -15,18 +15,18 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GO_VERSION: stable
-      GOLANGCI_LINT_VERSION: v2.1
+      GOLANGCI_LINT_VERSION: v2.4
       CGO_ENABLED: 0
 
     steps:
 
       # https://github.com/marketplace/actions/checkout
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       # https://github.com/marketplace/actions/setup-go-environment
       - name: Set up Go ${{ env.GO_VERSION }}
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -44,7 +44,7 @@ jobs:
           git diff --exit-code words_us.go
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v7
+        uses: golangci/golangci-lint-action@v8
         with:
           version: ${{ env.GOLANGCI_LINT_VERSION }}
 

.github/workflows/go-cross.yml

@@ -22,8 +22,8 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-go@v6
         with:
           go-version: ${{ matrix.go-version }}
 

.github/workflows/release.yml

@@ -14,16 +14,16 @@ jobs:
       CGO_ENABLED: 0
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
 
       # https://goreleaser.com/ci/actions/
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v6
         with:
           version: latest
           args: release --clean

.golangci.yml

@@ -37,7 +37,7 @@ linters:
     - tparallel
     - varnamelen
     - wrapcheck
-    - wsl # FIXME(ldez) must be fixed
+    - wsl # deprecated
 
   settings:
     depguard:

ascii.go

@@ -7,6 +7,7 @@ func ByteToUpper(x byte) byte {
 	c := b - byte(0x61)
 	d := ^(b - byte(0x7b))
 	e := (c & d) & (^x & 0x7f)
+
 	return x - (e >> 2)
 }
 
@@ -16,6 +17,7 @@ func ByteToLower(eax byte) byte {
 	ebx := eax&byte(0x7f) + byte(0x25)
 	ebx = ebx&byte(0x7f) + byte(0x1a)
 	ebx = ((ebx & ^eax) >> 2) & byte(0x20)
+
 	return eax + ebx
 }
 
@@ -32,18 +34,21 @@ func StringEqualFold(s1, s2 string) bool {
 	if len(s1) != len(s2) {
 		return false
 	}
+
 	for i := range len(s1) {
 		c1 := s1[i]
 		c2 := s2[i]
 		// c1 & c2
 		if c1 != c2 {
 			c1 |= 'a' - 'A'
+
 			c2 |= 'a' - 'A'
 			if c1 != c2 || c1 < 'a' || c1 > 'z' {
 				return false
 			}
 		}
 	}
+
 	return true
 }
 
@@ -53,8 +58,10 @@ func StringHasPrefixFold(s1, s2 string) bool {
 	if len(s1) < len(s2) {
 		return false
 	}
+
 	if len(s1) == len(s2) {
 		return StringEqualFold(s1, s2)
 	}
+
 	return StringEqualFold(s1[:len(s2)], s2)
 }

benchmark_test.go

@@ -18,10 +18,12 @@ func init() {
 	buf := bytes.Buffer{}
 	for i := 0; i < len(DictMain); i += 2 {
 		buf.WriteString(DictMain[i+1] + " ")
+
 		if i%5 == 0 {
 			buf.WriteString("\n")
 		}
 	}
+
 	sampleClean = buf.String()
 	sampleDirty = sampleClean + DictMain[0] + "\n"
 	rep = New()
@@ -31,9 +33,13 @@ func init() {
 func BenchmarkCleanString(b *testing.B) {
 	b.ResetTimer()
 	b.ReportAllocs()
-	var updated string
-	var diffs []Diff
-	var count int
+
+	var (
+		updated string
+		diffs   []Diff
+		count   int
+	)
+
 	for n := 0; n < b.N; n++ { //nolint:intrange // use Loop -> go1.24
 		updated, diffs = rep.Replace(sampleClean)
 		count += len(diffs)
@@ -52,9 +58,11 @@ func discardDiff(_ Diff) {
 func BenchmarkCleanStream(b *testing.B) {
 	b.ResetTimer()
 	b.ReportAllocs()
+
 	tmpCount = 0
 	buf := bytes.NewBufferString(sampleClean)
 	out := bytes.NewBuffer(make([]byte, 0, len(sampleClean)+100))
+
 	for n := 0; n < b.N; n++ { //nolint:intrange // use Loop -> go1.24
 		buf.Reset()
 		buf.WriteString(sampleClean)
@@ -70,6 +78,7 @@ func BenchmarkCleanStreamDiscard(b *testing.B) {
 
 	buf := bytes.NewBufferString(sampleClean)
 	tmpCount = 0
+
 	for n := 0; n < b.N; n++ { //nolint:intrange // use Loop -> go1.24
 		buf.Reset()
 		buf.WriteString(sampleClean)
@@ -81,9 +90,13 @@ func BenchmarkCleanStreamDiscard(b *testing.B) {
 func BenchmarkDirtyString(b *testing.B) {
 	b.ResetTimer()
 	b.ReportAllocs()
-	var updated string
-	var diffs []Diff
-	var count int
+
+	var (
+		updated string
+		diffs   []Diff
+		count   int
+	)
+
 	for n := 0; n < b.N; n++ { //nolint:intrange // use Loop -> go1.24
 		updated, diffs = rep.Replace(sampleDirty)
 		count += len(diffs)
@@ -96,8 +109,10 @@ func BenchmarkDirtyString(b *testing.B) {
 
 func BenchmarkCompile(b *testing.B) {
 	r := New()
+
 	b.ReportAllocs()
 	b.ResetTimer()
+
 	for n := 0; n < b.N; n++ { //nolint:intrange // use Loop -> go1.24
 		r.Compile()
 	}

case.go

@@ -39,6 +39,7 @@ func CaseStyle(word string) WordCase {
 	case upperCount == 1 && lowerCount > 0 && word[0] >= 'A' && word[0] <= 'Z':
 		return CaseTitle
 	}
+
 	return CaseUnknown
 }
 

cmd/misspell/main.go

@@ -90,9 +90,11 @@ func main() {
 	if *workers < 0 {
 		log.Fatalf("-j must >= 0")
 	}
+
 	if *workers == 0 {
 		*workers = runtime.NumCPU()
 	}
+
 	if *debugFlag {
 		*workers = 1
 	}
@@ -152,13 +154,16 @@ func main() {
 	// Output logger
 	//
 	var cleanup func() error
+
 	output, cleanup = newLogger(*quietFlag, *outFlag)
+
 	defer func() { _ = cleanup() }()
 
 	//
 	// Custom output format
 	//
 	var err error
+
 	defaultWrite, defaultRead, err = createTemplates(*format)
 	if err != nil {
 		log.Fatal(err)
@@ -176,14 +181,18 @@ func main() {
 	r.Compile()
 
 	args := flag.Args()
+
 	debug.Printf("initialization complete in %v", time.Since(t))
 
 	// stdin/stdout
 	if len(args) == 0 {
 		// If we are working with pipes/stdin/stdout there is no concurrency,
 		// so we can directly send data to the writers.
-		var fileOut io.Writer
-		var errOut io.Writer
+		var (
+			fileOut io.Writer
+			errOut  io.Writer
+		)
+
 		switch *writeit {
 		case true:
 			// If we are writing the corrected stream,
@@ -250,12 +259,15 @@ func main() {
 			if err == nil && !info.IsDir() {
 				c <- path
 			}
+
 			return nil
 		})
 	}
+
 	close(c)
 
 	count := 0
+
 	for range *workers {
 		changed := <-results
 		count += changed
@@ -273,6 +285,7 @@ func main() {
 
 func worker(writeit bool, r *misspell.Replacer, mode string, files <-chan string, results chan<- int) {
 	count := 0
+
 	for filename := range files {
 		orig, err := misspell.ReadTextFile(filename)
 		if err != nil {
@@ -286,8 +299,10 @@ func worker(writeit bool, r *misspell.Replacer, mode string, files <-chan string
 
 		debug.Printf("Processing %s", filename)
 
-		var updated string
-		var changes []misspell.Diff
+		var (
+			updated string
+			changes []misspell.Diff
+		)
 
 		if mode == "go" {
 			updated, changes = r.ReplaceGo(orig)
@@ -324,6 +339,7 @@ func worker(writeit bool, r *misspell.Replacer, mode string, files <-chan string
 			os.WriteFile(filename, []byte(updated), 0)
 		}
 	}
+
 	results <- count
 }
 
@@ -332,6 +348,7 @@ func readUserDict(userDictPath string) ([]string, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to load user defined corrections %q: %w", userDictPath, err)
 	}
+
 	defer func() { _ = file.Close() }()
 
 	reader := csv.NewReader(file)
@@ -365,11 +382,13 @@ func createTemplates(format string) (writeTmpl, readTmpl *template.Template, err
 		if err != nil {
 			return nil, nil, fmt.Errorf("unable to compile log format: %w", err)
 		}
+
 		return tmpl, tmpl, nil
 
 	default: // format == ""
 		writeTmpl = template.Must(template.New("defaultWrite").Parse(defaultWriteTmpl))
 		readTmpl = template.Must(template.New("defaultRead").Parse(defaultReadTmpl))
+
 		return
 	}
 }
@@ -393,6 +412,7 @@ func newLogger(quiet bool, outputPath string) (logger *log.Logger, cleanup func(
 		if err != nil {
 			log.Fatalf("unable to create outfile %q: %s", outputPath, err)
 		}
+
 		return log.New(fo, "", 0), fo.Close
 	}
 

ignore/glob.go

@@ -38,6 +38,7 @@ func (mm *MultiMatch) Match(arg string) bool {
 	// true, false -> true
 	// true, true -> false
 	use := false
+
 	for _, m := range mm.matchers {
 		if m.Match(arg) {
 			use = m.True()
@@ -69,9 +70,11 @@ func NewGlobMatch(arg []byte) (*GlobMatch, error) {
 		truth = false
 		arg = arg[1:]
 	}
+
 	if bytes.IndexByte(arg, '/') == -1 {
 		return NewBaseGlobMatch(string(arg), truth)
 	}
+
 	return NewPathGlobMatch(string(arg), truth)
 }
 
@@ -82,6 +85,7 @@ func NewBaseGlobMatch(arg string, truth bool) (*GlobMatch, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	return &GlobMatch{orig: arg, matcher: g, normal: truth}, nil
 }
 
@@ -98,6 +102,7 @@ func NewPathGlobMatch(arg string, truth bool) (*GlobMatch, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	return &GlobMatch{orig: arg, matcher: g, normal: truth}, nil
 }
 
@@ -107,7 +112,7 @@ func (g *GlobMatch) True() bool { return g.normal }
 
 // MarshalText is really a debug function.
 func (g *GlobMatch) MarshalText() ([]byte, error) {
-	return []byte(fmt.Sprintf("\"%s: %v %s\"", "GlobMatch", g.normal, g.orig)), nil
+	return fmt.Appendf(nil, `"%s: %v %s"`, "GlobMatch", g.normal, g.orig), nil
 }
 
 // Match satisfies the Matcher interface.

ignore/parse.go

@@ -7,6 +7,7 @@ import (
 // Parse reads in a gitignore file and returns a Matcher.
 func Parse(src []byte) (*MultiMatch, error) {
 	var matchers []Matcher
+
 	lines := bytes.Split(src, []byte{'\n'})
 
 	for _, line := range lines {