Merge branch 'main' into main

uber-go · Sep 23, 2024 · 6ac4347 · 6ac4347
2 parents 2cb45fb + c50d83c
commit 6ac4347
Show file tree

Hide file tree

Showing 47 changed files with 84 additions and 280 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -20,7 +20,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v4
       with:
-        go-version: 1.22.x
+        go-version: 1.23.x
 
     - name: Prepare release
       run: |

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -12,7 +12,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.19.x, 1.21.x, 1.22.x] # oldest version that can build go mock and official supported go versions
+        go-version: [1.22.x, 1.23.x] # oldest version that can build go mock and official supported go versions
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module go.uber.org/mock
 
-go 1.23
+go 1.22
 
 require (
 	github.com/stretchr/testify v1.9.0

diff --git a/gomock/internal/mock_gomock/mock_matcher.go b/gomock/internal/mock_gomock/mock_matcher.go
diff --git a/gomock/mock_test.go b/gomock/mock_test.go
diff --git a/gomock/string.go b/gomock/string.go
@@ -1,25 +1,36 @@
 package gomock
 
-import "fmt"
-
-type mockInstance interface {
-	ISGOMOCK() struct{}
-}
-type mockedStringer interface {
-	fmt.Stringer
-	mockInstance
-}
+import (
+	"fmt"
+	"reflect"
+)
 
 // getString is a safe way to convert a value to a string for printing results
 // If the value is a a mock, getString avoids calling the mocked String() method,
 // which avoids potential deadlocks
 func getString(x any) string {
-	switch v := x.(type) {
-	case mockedStringer:
-		return fmt.Sprintf("%T", v)
-	case fmt.Stringer:
-		return v.String()
-	default:
-		return fmt.Sprintf("%v", v)
+	if isGeneratedMock(x) {
+		return fmt.Sprintf("%T", x)
+	}
+	if s, ok := x.(fmt.Stringer); ok {
+		return s.String()
+	}
+	return fmt.Sprintf("%v", x)
+}
+
+// isGeneratedMock checks if the given type has a "isgomock" field,
+// indicating it is a generated mock.
+func isGeneratedMock(x any) bool {
+	typ := reflect.TypeOf(x)
+	if typ == nil {
+		return false
+	}
+	if typ.Kind() == reflect.Ptr {
+		typ = typ.Elem()
+	}
+	if typ.Kind() != reflect.Struct {
+		return false
 	}
+	_, isgomock := typ.FieldByName("isgomock")
+	return isgomock
 }
diff --git a/mockgen/internal/tests/add_generate_directive/mock.go b/mockgen/internal/tests/add_generate_directive/mock.go
diff --git a/mockgen/internal/tests/const_array_length/mock.go b/mockgen/internal/tests/const_array_length/mock.go
diff --git a/mockgen/internal/tests/copyright_file/mock.go b/mockgen/internal/tests/copyright_file/mock.go
diff --git a/mockgen/internal/tests/custom_package_name/greeter/greeter_mock_test.go b/mockgen/internal/tests/custom_package_name/greeter/greeter_mock_test.go
diff --git a/mockgen/internal/tests/defined_import_local_name/mock.go b/mockgen/internal/tests/defined_import_local_name/mock.go
diff --git a/mockgen/internal/tests/dot_imports/mock.go b/mockgen/internal/tests/dot_imports/mock.go
diff --git a/mockgen/internal/tests/empty_interface/mock.go b/mockgen/internal/tests/empty_interface/mock.go
diff --git a/mockgen/internal/tests/exclude/mock.go b/mockgen/internal/tests/exclude/mock.go
diff --git a/mockgen/internal/tests/extra_import/mock.go b/mockgen/internal/tests/extra_import/mock.go
diff --git a/mockgen/internal/tests/generated_identifier_conflict/bugreport_mock.go b/mockgen/internal/tests/generated_identifier_conflict/bugreport_mock.go
diff --git a/mockgen/internal/tests/generics/go.mod b/mockgen/internal/tests/generics/go.mod
@@ -1,6 +1,6 @@
 module go.uber.org/mock/mockgen/internal/tests/generics
 
-go 1.23
+go 1.22
 
 replace go.uber.org/mock => ../../../..