Update Golang and tools version for new language idioms

go.mod

@@ -1,10 +1,13 @@
 module github.com/matryer/moq
 
-go 1.18
+go 1.22.5
 
 require (
 	github.com/pmezard/go-difflib v1.0.0
-	golang.org/x/tools v0.17.0
+	golang.org/x/tools v0.24.0
 )
 
-require golang.org/x/mod v0.14.0 // indirect
+require (
+	golang.org/x/mod v0.20.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+)

go.sum

@@ -1,7 +1,8 @@
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
-golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
-golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
+golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
+golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
+golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=

main.go

@@ -6,7 +6,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -109,5 +108,5 @@ func run(flags userFlags) error {
 		return err
 	}
 
-	return ioutil.WriteFile(flags.outFile, buf.Bytes(), 0o600)
+	return os.WriteFile(flags.outFile, buf.Bytes(), 0o600)
 }

pkg/moq/moq_test.go

@@ -5,7 +5,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -407,6 +406,12 @@ func TestMockGolden(t *testing.T) {
 			interfaces: []string{"ResetStore"},
 			goldenFile: filepath.Join("testpackages/withresets", "withresets_moq.golden.go"),
 		},
+		{
+			name:       "RangeNumber",
+			cfg:        Config{SrcDir: "testpackages/rangenum"},
+			interfaces: []string{"Magician"},
+			goldenFile: filepath.Join("testpackages/rangenum", "rangenum_moq.golden.go"),
+		},
 	}
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
@@ -464,14 +469,14 @@ func matchGoldenFile(goldenFile string, actual []byte) error {
 		if err := os.MkdirAll(filepath.Dir(goldenFile), 0o750); err != nil {
 			return fmt.Errorf("create dir: %s", err)
 		}
-		if err := ioutil.WriteFile(goldenFile, actual, 0o600); err != nil {
+		if err := os.WriteFile(goldenFile, actual, 0o600); err != nil {
 			return fmt.Errorf("write: %s", err)
 		}
 
 		return nil
 	}
 
-	expected, err := ioutil.ReadFile(goldenFile)
+	expected, err := os.ReadFile(goldenFile)
 	if err != nil {
 		return fmt.Errorf("read: %s: %s", goldenFile, err)
 	}
@@ -694,7 +699,7 @@ func TestMockError(t *testing.T) {
 	}
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
-			err := m.Mock(ioutil.Discard, tc.namePair)
+			err := m.Mock(io.Discard, tc.namePair)
 			if err == nil {
 				t.Errorf("expected error but got nil")
 				return

pkg/moq/testpackages/go.mod

@@ -1,5 +1,5 @@
 module github.com/matryer/moq/pkg/moq/testpackages
 
-go 1.18
+go 1.22.5
 
 require github.com/sudo-suhas/moq-test-pkgs/somerepo v0.0.0-20200816045313-d2f573eea6c7

pkg/moq/testpackages/rangenum/rangenum.go

@@ -0,0 +1,13 @@
+package rangenum
+
+import "fmt"
+
+func DoMagic() {
+	for range 10 {
+		fmt.Println("abrakadabra")
+	}
+}
+
+type Magician interface {
+	DoMagic()
+}