diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2022-09-22 05:54:49 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2022-09-23 14:12:37 -0400 |
| commit | 54653ceebeabaf30e89d69e0f5aa5de431cc6bd7 (patch) | |
| tree | 34efe49d86e9ba64c3a9ef7b2bdb22cb9cc3d37e /vendor/github.com/google/go-cmp/cmp/report_compare.go | |
| parent | 25dc2759e10bf0293f14a2205291ab7dd53eccf4 (diff) | |
| download | podman-54653ceebeabaf30e89d69e0f5aa5de431cc6bd7.tar.gz podman-54653ceebeabaf30e89d69e0f5aa5de431cc6bd7.tar.bz2 podman-54653ceebeabaf30e89d69e0f5aa5de431cc6bd7.zip | |
Update vendor or containers/buildah
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/github.com/google/go-cmp/cmp/report_compare.go')
| -rw-r--r-- | vendor/github.com/google/go-cmp/cmp/report_compare.go | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vendor/github.com/google/go-cmp/cmp/report_compare.go b/vendor/github.com/google/go-cmp/cmp/report_compare.go index 1ef65ac1d..2050bf6b4 100644 --- a/vendor/github.com/google/go-cmp/cmp/report_compare.go +++ b/vendor/github.com/google/go-cmp/cmp/report_compare.go @@ -7,8 +7,6 @@ package cmp import ( "fmt" "reflect" - - "github.com/google/go-cmp/cmp/internal/value" ) // numContextRecords is the number of surrounding equal records to print. @@ -117,7 +115,7 @@ func (opts formatOptions) FormatDiff(v *valueNode, ptrs *pointerReferences) (out // For leaf nodes, format the value based on the reflect.Values alone. // As a special case, treat equal []byte as a leaf nodes. - isBytes := v.Type.Kind() == reflect.Slice && v.Type.Elem() == reflect.TypeOf(byte(0)) + isBytes := v.Type.Kind() == reflect.Slice && v.Type.Elem() == byteType isEqualBytes := isBytes && v.NumDiff+v.NumIgnored+v.NumTransformed == 0 if v.MaxDepth == 0 || isEqualBytes { switch opts.DiffMode { @@ -248,11 +246,11 @@ func (opts formatOptions) formatDiffList(recs []reportRecord, k reflect.Kind, pt var isZero bool switch opts.DiffMode { case diffIdentical: - isZero = value.IsZero(r.Value.ValueX) || value.IsZero(r.Value.ValueY) + isZero = r.Value.ValueX.IsZero() || r.Value.ValueY.IsZero() case diffRemoved: - isZero = value.IsZero(r.Value.ValueX) + isZero = r.Value.ValueX.IsZero() case diffInserted: - isZero = value.IsZero(r.Value.ValueY) + isZero = r.Value.ValueY.IsZero() } if isZero { continue |