Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Adjust for reflect.Type.NumMethod change in Go1.16 (#240)" #242

Merged
merged 1 commit into from
Nov 12, 2020
Merged

Revert "Adjust for reflect.Type.NumMethod change in Go1.16 (#240)" #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cmp/cmpopts/ignore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/internal/function"
"github.com/google/go-cmp/cmp/internal/value"
)

// IgnoreFields returns an Option that ignores fields of the
Expand Down Expand Up @@ -83,7 +82,7 @@ func newIfaceFilter(ifaces interface{}) (tf ifaceFilter) {
panic("struct cannot have named fields")
case fi.Type.Kind() != reflect.Interface:
panic("embedded field must be an interface type")
case value.IsEmptyInterface(fi.Type):
case fi.Type.NumMethod() == 0:
// This matches everything; why would you ever want this?
panic("cannot ignore empty interface")
default:
Expand Down
14 changes: 0 additions & 14 deletions cmp/internal/value/iface.go
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions cmp/internal/value/iface_test.go
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions cmp/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"strings"

"github.com/google/go-cmp/cmp/internal/function"
"github.com/google/go-cmp/cmp/internal/value"
)

// Option configures for specific behavior of Equal and Diff. In particular,
Expand Down Expand Up @@ -162,7 +161,7 @@ func FilterValues(f interface{}, opt Option) Option {
}
if opt := normalizeOption(opt); opt != nil {
vf := &valuesFilter{fnc: v, opt: opt}
if ti := v.Type().In(0); !value.IsEmptyInterface(ti) {
if ti := v.Type().In(0); ti.Kind() != reflect.Interface || ti.NumMethod() > 0 {
vf.typ = ti
}
return vf
Expand Down Expand Up @@ -287,7 +286,7 @@ func Transformer(name string, f interface{}) Option {
panic(fmt.Sprintf("invalid name: %q", name))
}
tr := &transformer{name: name, fnc: reflect.ValueOf(f)}
if ti := v.Type().In(0); !value.IsEmptyInterface(ti) {
if ti := v.Type().In(0); ti.Kind() != reflect.Interface || ti.NumMethod() > 0 {
tr.typ = ti
}
return tr
Expand Down Expand Up @@ -346,7 +345,7 @@ func Comparer(f interface{}) Option {
panic(fmt.Sprintf("invalid comparer function: %T", f))
}
cm := &comparer{fnc: v}
if ti := v.Type().In(0); !value.IsEmptyInterface(ti) {
if ti := v.Type().In(0); ti.Kind() != reflect.Interface || ti.NumMethod() > 0 {
cm.typ = ti
}
return cm
Expand Down