mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-13 11:19:49 -06:00
Code Issues Packages Projects Releases 129 Wiki Activity

Disallow nil in Value Equals (#2156)

Browse Source 
We do not allow nil in any other places as a Vale so there is
little reason to allow it Equals

Fixes #2155
This commit is contained in:
Erik Arvidsson
2016-07-28 16:58:33 -07:00
committed by GitHub
parent 74ba1012c2
commit a995d5dafc
8 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go/types/blob.go
View File

@@ -53,7 +53,7 @@ func (b Blob) hashPointer() *hash.Hash {
// Value interface
func (b Blob) Equals(other Value) bool {
return other != nil && b.Hash() == other.Hash()
return b.Hash() == other.Hash()
}
func (b Blob) Less(other Value) bool {

4
go/types/equals_test.go
View File

@@ -15,7 +15,6 @@ func TestValueEquals(t *testing.T) {
assert := assert.New(t)
values := []func() Value{
func() Value { return nil },
func() Value { return Bool(false) },
func() Value { return Bool(true) },
func() Value { return Number(0) },
@@ -69,9 +68,6 @@ func TestValueEquals(t *testing.T) {
for i, f1 := range values {
for j, f2 := range values {
if f1() == nil {
continue
}
if i == j {
assert.True(f1().Equals(f2()))
} else {

2
go/types/list.go
View File

@@ -60,7 +60,7 @@ func (l List) hashPointer() *hash.Hash {
// Value interface
func (l List) Equals(other Value) bool {
return other != nil && l.Hash() == other.Hash()
return l.Hash() == other.Hash()
}
func (l List) Less(other Value) bool {

2
go/types/map.go
View File

@@ -85,7 +85,7 @@ func (m Map) hashPointer() *hash.Hash {
// Value interface
func (m Map) Equals(other Value) bool {
return other != nil && m.Hash() == other.Hash()
return m.Hash() == other.Hash()
}
func (m Map) Less(other Value) bool {

2
go/types/ref.go
View File

@@ -52,7 +52,7 @@ func (r Ref) TargetValue(vr ValueReader) Value {
// Value interface
func (r Ref) Equals(other Value) bool {
return other != nil && r.Hash() == other.Hash()
return r.Hash() == other.Hash()
}
func (r Ref) Less(other Value) bool {

2
go/types/set.go
View File

@@ -56,7 +56,7 @@ func (s Set) hashPointer() *hash.Hash {
// Value interface
func (s Set) Equals(other Value) bool {
return other != nil && s.Hash() == other.Hash()
return s.Hash() == other.Hash()
}
func (s Set) Less(other Value) bool {

2
go/types/struct.go
View File

@@ -60,7 +60,7 @@ func (s Struct) hashPointer() *hash.Hash {
// Value interface
func (s Struct) Equals(other Value) bool {
return other != nil && s.Hash() == other.Hash()
return s.Hash() == other.Hash()
}
func (s Struct) Less(other Value) bool {

2
go/types/type.go
View File

@@ -68,7 +68,7 @@ func (t *Type) HasUnresolvedCycle() bool {
// Value interface
func (t *Type) Equals(other Value) (res bool) {
return other != nil && t.Hash() == other.Hash()
return t == other || t.Hash() == other.Hash()
}
func (t *Type) Less(other Value) (res bool) {