Upgrade go version

.github/workflows/actions.yml

@@ -13,20 +13,20 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: golangci/golangci-lint-action@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
         with:
-          version: v1.50.1
+          version: v1.64.8
   test:
     name: Test
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [ '1.18.x', '1.19.x' ]
+        go: [ 'stable', 'oldstable' ]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
         with:
           go-version: ${{ matrix.go }}
       - run: go test -race -covermode=atomic -coverprofile=coverage.txt ./...
-      - uses: codecov/codecov-action@v2
+      - uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0

.golangci.yml

@@ -1,6 +1,6 @@
 linters-settings:
   errcheck:
-    check-type-asserts: true
+    check-type-assertions: true
     check-blank: true
   misspell:
     locale: US
@@ -11,6 +11,7 @@ linters:
   enable-all: true
   disable:
     - varnamelen
+    - depguard
 
 issues:
     exclude-rules:

filter/cuckoo_test.go

@@ -14,7 +14,7 @@ func TestNewCuckooFilter(t *testing.T) {
 
 	if cf == nil || cf.Cuckoo == nil {
 		t.Error("should not be nil")
-	} else if int(cf.Cuckoo.Count()) != 3 {
+	} else if cf.Cuckoo.Count() != 3 {
 		t.Error("should be 3")
 	}
 

go.mod

@@ -1,13 +1,15 @@
 module github.com/osamingo/shamoji
 
-go 1.18
+go 1.24
+
+toolchain go1.24.1
 
 require (
-	github.com/ikawaha/kagome-dict/uni v1.1.8
-	github.com/ikawaha/kagome/v2 v2.9.0
+	github.com/ikawaha/kagome-dict/uni v1.2.1
+	github.com/ikawaha/kagome/v2 v2.10.1
 	github.com/irfansharif/cfilter v0.1.1
-	golang.org/x/sync v0.1.0
-	golang.org/x/text v0.4.0
+	golang.org/x/sync v0.12.0
+	golang.org/x/text v0.23.0
 )
 
-require github.com/ikawaha/kagome-dict v1.0.7 // indirect
+require github.com/ikawaha/kagome-dict v1.1.2 // indirect

go.sum

@@ -1,13 +1,14 @@
-github.com/ikawaha/kagome-dict v1.0.7 h1:W31gx2VH0LQxrYRn9yDz2pqpY36UxcxqEHqQ4U9n0vA=
-github.com/ikawaha/kagome-dict v1.0.7/go.mod h1:URXr0HwDcdBPNDn1uw8hnem4zhildeAeCXuTWQFA7NA=
-github.com/ikawaha/kagome-dict/ipa v1.0.9 h1:iQITqQKpYtby83z6IglEKozV2Arbv70JHxIdKf4RRMA=
-github.com/ikawaha/kagome-dict/uni v1.1.8 h1:yH+4qTpPemGKQs9URIwx7FVlc47W2rivST3OEd0N67w=
-github.com/ikawaha/kagome-dict/uni v1.1.8/go.mod h1:GIK9DuT8p5p9PS4imR9OP/M25bQVrgbQMbxSbvAE6E8=
-github.com/ikawaha/kagome/v2 v2.9.0 h1:J5t2JteaqjjKjuHMMA/8Pq9DEuhuuKMPvf8ua097M7w=
-github.com/ikawaha/kagome/v2 v2.9.0/go.mod h1:uHUMeHH+6ORiag4AF55fTQF4PrIuBjKSEsZ6HcUcfJI=
+github.com/ikawaha/kagome-dict v1.1.2 h1:VJxjsNPl/dzCd2022Je6KLHlSBXJJ4v6wzMBaK65SGU=
+github.com/ikawaha/kagome-dict v1.1.2/go.mod h1:vCezTsAry4MpUl2n2NUfE1CG3meQlxulWfglT7pf1gw=
+github.com/ikawaha/kagome-dict/ipa v1.2.1 h1:+pPV8tH9Wz699AnxvYu7OGYUTfgcDSs3OJW0VuYrUNM=
+github.com/ikawaha/kagome-dict/ipa v1.2.1/go.mod h1:AjHGD0cctM9lnSS6SKqeTw0DaI2vTRVuTkFy1WGw6No=
+github.com/ikawaha/kagome-dict/uni v1.2.1 h1:hIgle96rqyfgHxKRhOzCtGrXvRwsGgD6Rel28keDZIM=
+github.com/ikawaha/kagome-dict/uni v1.2.1/go.mod h1:d7msFVR3izhein5HDlytpQn+4VRPyrHSmGz/o/RekGs=
+github.com/ikawaha/kagome/v2 v2.10.1 h1:DeczoMh1T03ay0ukGyMRJTnznlOL/Fgnz+vRNp77l2o=
+github.com/ikawaha/kagome/v2 v2.10.1/go.mod h1:Smz59vvaZ1GxofSQZq0WZAWqDdSijYPjx9u7DRYz7EE=
 github.com/irfansharif/cfilter v0.1.1 h1:jUBtJeleLcwXw+96rzfq6D9zNzO3Lbrt81YDF5lMM/o=
 github.com/irfansharif/cfilter v0.1.1/go.mod h1:lev72lI5FgjU6ayV2obe0SxeiVJ20TTi9TKmkdPW3h8=
-golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=

shamoji.go

@@ -49,8 +49,6 @@ func (s *Serve) DoAsync(ctx context.Context, sentence string) (bool, string) {
 	eg, _ := errgroup.WithContext(ctx)
 
 	for i := range ts {
-		i := i
-
 		eg.Go(func() error {
 			if s.Filer.Test(ts[i]) {
 				// define found error type...

shamoji_test.go

@@ -1,7 +1,6 @@
 package shamoji_test
 
 import (
-	"context"
 	"strings"
 	"testing"
 
@@ -60,15 +59,14 @@ func TestServe_Do(t *testing.T) {
 	}
 
 	for n, c := range cases {
-		c := c
-
 		t.Run(n, func(t *testing.T) {
 			t.Parallel()
 
 			ret, token := s.Do(c.sentence)
 			if ret != c.result {
 				t.Error("shoud be", c.result)
 			}
+
 			if token != c.expect {
 				t.Error("shoud be", c.result)
 			}
@@ -92,15 +90,14 @@ func TestServe_DoAsync(t *testing.T) {
 	}
 
 	for n, c := range cases {
-		c := c
-
 		t.Run(n, func(t *testing.T) {
 			t.Parallel()
 
-			ret, token := s.DoAsync(context.Background(), c.sentence)
+			ret, token := s.DoAsync(t.Context(), c.sentence)
 			if ret != c.result {
 				t.Error("shoud be ", c.result)
 			}
+
 			if token != c.expect {
 				t.Error("shoud be ", c.result)
 			}

tokenizer/kagome.go

@@ -20,8 +20,6 @@ func (kt *KagomeTokenizer) Tokenize(sentence string) [][]byte {
 	ch := make(chan []byte, len(ts))
 
 	for i := range ts {
-		i := i
-
 		go func() {
 			var s []byte
 			defer func() {
@@ -33,6 +31,7 @@ func (kt *KagomeTokenizer) Tokenize(sentence string) [][]byte {
 			}
 
 			switch ts[i].Features()[0] {
+			//nolint: gosmopolitan
 			case "", "連体詞", "接続詞", "助詞", "助動詞", "記号", "フィラー", "その他":
 				return
 			default:

tokenizer/kagome_test.go

@@ -45,8 +45,6 @@ func TestKagomeTokenizer_Tokenize(t *testing.T) {
 	}
 
 	for n, c := range cases {
-		c := c
-
 		t.Run(n, func(t *testing.T) {
 			t.Parallel()