Remove deprecated matcher options, remove legacy mock generation

This makes the golang.org/x/tools/go/packages based generation the default generation method and also the only one.

Because this could, in theory, be a behavioral breaking change, bumping major version.

README.md

@@ -14,8 +14,8 @@ Installing Pegomock
 Pegomock consists of a binary `pegomock` and a package. Install both via:
 
 ```shell
-go install github.com/petergtz/pegomock/v3/pegomock@latest
-go get github.com/petergtz/pegomock/v3@latest
+go install github.com/petergtz/pegomock/v4/pegomock@latest
+go get github.com/petergtz/pegomock/v4@latest
 ```
 
 This will download the package and install an executable `pegomock` in the directory named by the `$GOBIN` environment variable, which defaults to `$GOPATH/bin` or `$HOME/go/bin` if the `$GOPATH` environment variable is not set.
@@ -37,7 +37,7 @@ The preferred way is:
 
 ```go
 import (
-	"github.com/petergtz/pegomock/v3"
+	"github.com/petergtz/pegomock/v4"
 	"testing"
 )
 
@@ -86,7 +86,7 @@ package some_test
 
 import (
 	. "github.com/onsi/ginkgo"
-	. "github.com/petergtz/pegomock/v3/ginkgo_compatible"
+	. "github.com/petergtz/pegomock/v4/ginkgo_compatible"
 )
 
 var _ = Describe("Some function", func() {
@@ -406,7 +406,7 @@ Installation
 Install it via:
 
 ```shell
-go install github.com/petergtz/pegomock/v3/pegomock@latest
+go install github.com/petergtz/pegomock/v4/pegomock@latest
 ```
 
 Tracking the pegomock tool in your project
@@ -425,15 +425,15 @@ Go modules allow to pin not only a package but also a tool (that is, an executab
 package tools
 
 import (
-	_ "github.com/petergtz/pegomock/v3/pegomock"
+	_ "github.com/petergtz/pegomock/v4/pegomock"
 )
 ```
 2. Set `$GOBIN` to a `bin` directory relative to your repo (this defines where tool dependencies will be installed).
 2. Install the tool with `go install`:
 ```console
 $ cd /path/to/myproject
 $ export GOBIN=$PWD/bin
-$ go install github.com/petergtz/pegomock/v3/pegomock
+$ go install github.com/petergtz/pegomock/v4/pegomock
 ```
 3. Use that `$GOBIN` when invoking `pegomock` for that project:
 ```console

dsl.go

@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/onsi/gomega/format"
-	"github.com/petergtz/pegomock/v3/internal/verify"
+	"github.com/petergtz/pegomock/v4/internal/verify"
 )
 
 var GlobalFailHandler FailHandler

dsl_test.go

@@ -22,12 +22,11 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/petergtz/pegomock/v3"
-
 	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
-	"github.com/petergtz/pegomock/v3"
-	"github.com/petergtz/pegomock/v3/test_interface"
+	"github.com/petergtz/pegomock/v4"
+	. "github.com/petergtz/pegomock/v4"
+	"github.com/petergtz/pegomock/v4/test_interface"
 	"github.com/samber/lo"
 )
 
@@ -195,7 +194,7 @@ var _ = Describe("MockDisplay", func() {
 		})
 	})
 
-	Describe("https://github.com/petergtz/pegomock/v3/issues/24", func() {
+	Describe("https://github.com/petergtz/pegomock/v4/issues/24", func() {
 		Context("Stubbing with nil value", func() {
 			It("does not panic when return type is interface{}", func() {
 				When(display.InterfaceReturnValue()).ThenReturn(nil)
@@ -343,7 +342,7 @@ var _ = Describe("MockDisplay", func() {
 
 		Context("Never calling Flash", func() {
 			It("succeeds during verification when using Never() and argument matchers", func() {
-				// https://github.com/petergtz/pegomock/v3/issues/34
+				// https://github.com/petergtz/pegomock/v4/issues/34
 				Expect(func() { display.VerifyWasCalled(Never()).Flash(Any[string](), Any[int]()) }).NotTo(Panic())
 			})
 		})

generate_test_mocks/xtools_go_loader/generate_test.go

@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo/v2"
-	"github.com/petergtz/pegomock/v3/pegomock/filehandling"
+	"github.com/petergtz/pegomock/v4/pegomock/filehandling"
 )
 
 func TestMockGeneration(t *testing.T) {
@@ -28,12 +28,12 @@ func TestMockGeneration(t *testing.T) {
 
 var _ = It("Generate mocks", func() {
 	filehandling.GenerateMockFile(
-		[]string{"github.com/petergtz/pegomock/v3/test_interface", "Display"},
+		[]string{"github.com/petergtz/pegomock/v4/test_interface", "Display"},
 		"../../mock_display_test.go", "MockDisplay", "pegomock_test",
-		"", false, os.Stdout, true, true, "")
+		"", false, os.Stdout)
 
 	filehandling.GenerateMockFile(
-		[]string{"github.com/petergtz/pegomock/v3/test_interface", "GenericDisplay"},
+		[]string{"github.com/petergtz/pegomock/v4/test_interface", "GenericDisplay"},
 		"../../mock_generic_display_test.go", "MockGenericDisplay", "pegomock_test",
-		"", false, os.Stdout, true, false, "")
+		"", false, os.Stdout)
 })

ginkgo_compatible/in_order_context.go

@@ -1,5 +1,3 @@
 package mock
 
-import "github.com/petergtz/pegomock/v3"
-
 type InOrderContext = pegomock.InOrderContext

ginkgo_compatible/matchers.go

@@ -1,7 +1,7 @@
 package mock
 
 import (
-	"github.com/petergtz/pegomock/v3"
+	"github.com/petergtz/pegomock/v4"
 )
 
 var (

ginkgo_compatible/matchers_generic.go

@@ -1,7 +1,5 @@
 package mock
 
-import "github.com/petergtz/pegomock/v3"
-
 func Eq[T any](value T) T    { return pegomock.Eq(value) }
 func NotEq[T any](value T) T { return pegomock.NotEq(value) }
 func Any[T any]() T          { return pegomock.Any[T]() }

ginkgo_compatible/option.go

@@ -1,7 +1,3 @@
 package mock
 
-import (
-	"github.com/petergtz/pegomock/v3"
-)
-
 var OptionWithT = pegomock.WithT

ginkgo_compatible/whenever.go

@@ -1,7 +1,3 @@
 package mock
 
-import (
-	"github.com/petergtz/pegomock/v3"
-)
-
 var Whenever = pegomock.When

go.mod

@@ -1,4 +1,4 @@
-module github.com/petergtz/pegomock/v3
+module github.com/petergtz/pegomock/v4
 
 go 1.18
 

internal/generate_matchers/matcher_generation.go

@@ -9,7 +9,7 @@ import (
 
 // Generate matchers:
 //
-//     go generate github.com/petergtz/pegomock/v3/internal/generate_matchers
+//     go generate github.com/petergtz/pegomock/v4/internal/generate_matchers
 
 //go:generate go run matcher_generation.go
 //go:generate go fmt ../../matcher_factories.go
@@ -37,18 +37,6 @@ import (
 
 	for _, kind := range primitiveKinds {
 		contents += fmt.Sprintf(`
-// Deprecated: Use Eq[T any](value T) instead.
-func Eq%[1]s(value %[2]s) %[2]s {
-	RegisterMatcher(&EqMatcher{Value: value})
-	return %[4]s
-}
-
-// Deprecated: Use NotEq[T any](value T) instead.
-func NotEq%[1]s(value %[2]s) %[2]s {
-	RegisterMatcher(&NotEqMatcher{Value: value})
-	return %[4]s
-}
-
 // Deprecated: Use Any[T any]() instead.
 func Any%[1]s() %[2]s {
 	RegisterMatcher(NewAnyMatcher(reflect.TypeOf(%[3]s)))
@@ -61,18 +49,6 @@ func %[1]sThat(matcher ArgumentMatcher) %[2]s {
 	return %[4]s
 }
 
-// Deprecated: Use Eq[T any](value T) instead.
-func Eq%[1]sSlice(value []%[2]s) []%[2]s {
-	RegisterMatcher(&EqMatcher{Value: value})
-	return nil
-}
-
-// Deprecated: Use NotEq[T any](value T) instead.
-func NotEq%[1]sSlice(value []%[2]s) []%[2]s {
-	RegisterMatcher(&NotEqMatcher{Value: value})
-	return nil
-}
-
 // Deprecated: Use Any[T any]() instead.
 func Any%[1]sSlice() []%[2]s {
 	RegisterMatcher(NewAnyMatcher(reflect.SliceOf(reflect.TypeOf(%[3]s))))
@@ -89,18 +65,6 @@ func %[1]sSliceThat(matcher ArgumentMatcher) []%[2]s {
 
 	// hard-coding this for now as interface{} overall works slightly different than other types.
 	return contents + `
-// Deprecated: Use Eq[T any](value T) instead.
-func EqInterface(value interface{}) interface{} {
-	RegisterMatcher(&EqMatcher{Value: value})
-	return nil
-}
-
-// Deprecated: Use NotEq[T any](value T) instead.
-func NotEqInterface(value interface{}) interface{} {
-	RegisterMatcher(&NotEqMatcher{Value: value})
-	return nil
-}
-
 // Deprecated: Use Any[T any]() instead.
 func AnyInterface() interface{} {
 	RegisterMatcher(NewAnyMatcher(reflect.TypeOf((*interface{})(nil)).Elem()))
@@ -113,18 +77,6 @@ func InterfaceThat(matcher ArgumentMatcher) interface{} {
 	return nil
 }
 
-// Deprecated: Use Eq[T any](value T) instead.
-func EqInterfaceSlice(value []interface{}) []interface{} {
-	RegisterMatcher(&EqMatcher{Value: value})
-	return nil
-}
-
-// Deprecated: Use NotEq[T any](value T) instead.
-func NotEqInterfaceSlice(value []interface{}) []interface{} {
-	RegisterMatcher(&NotEqMatcher{Value: value})
-	return nil
-}
-
 // Deprecated: Use Any[T any]() instead.
 func AnyInterfaceSlice() []interface{} {
 	RegisterMatcher(NewAnyMatcher(reflect.SliceOf(reflect.TypeOf((*interface{})(nil)).Elem())))
@@ -143,7 +95,7 @@ func GenerateGinkgoMatchersFile() string {
 	contents := `package mock
 
 import (
-	"github.com/petergtz/pegomock/v3"
+	"github.com/petergtz/pegomock/v4"
 )
 
 var (`

matcher.go

@@ -6,7 +6,7 @@ import (
 
 	"sync"
 
-	"github.com/petergtz/pegomock/v3/internal/verify"
+	"github.com/petergtz/pegomock/v4/internal/verify"
 )
 
 type EqMatcher struct {