mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-10 07:34:04 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #68 from prometheus/simplify-equals

Browse source 
Simplify Labels.Equals()
This commit is contained in:
Julius Volz 2017-04-28 09:05:35 -05:00 committed by GitHub
parent b098c36d27 a25f874ec4
commit 006f5d6b22
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
labels/labels.go
View file

@ -84,7 +84,7 @@ func (ls Labels) Equals(o Labels) bool {
return false return false
} }
for i, l := range ls { for i, l := range ls {
if l.Name != o[i].Name || l.Value != o[i].Value { if o[i] != l {
return false return false
} }
} }

3
labels/labels_test.go
View file

@ -28,7 +28,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
func TestCompare(t *testing.T) { func TestCompareAndEquals(t *testing.T) {
cases := []struct { cases := []struct {
a, b []Label a, b []Label
res int res int
@ -88,6 +88,7 @@ func TestCompare(t *testing.T) {
a, b := New(c.a...), New(c.b...) a, b := New(c.a...), New(c.b...)
require.Equal(t, c.res, Compare(a, b)) require.Equal(t, c.res, Compare(a, b))
require.Equal(t, c.res == 0, a.Equals(b))
} }
} }