From 87d91c55d913684c3430267a5f3658230a3dc616 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Mon, 29 May 2017 12:33:46 +0100 Subject: [PATCH] use mapToString where possible --- report/edge_metadatas.go | 19 +------------------ report/sets.go | 20 +------------------- 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/report/edge_metadatas.go b/report/edge_metadatas.go index 4d34e95a9..24b206401 100644 --- a/report/edge_metadatas.go +++ b/report/edge_metadatas.go @@ -1,10 +1,8 @@ package report import ( - "bytes" "fmt" "reflect" - "sort" "strconv" "github.com/ugorji/go/codec" @@ -109,22 +107,7 @@ func (c EdgeMetadatas) ForEach(fn func(k string, v EdgeMetadata)) { } func (c EdgeMetadatas) String() string { - keys := []string{} - if c.psMap == nil { - c = EmptyEdgeMetadatas - } - for _, k := range c.psMap.Keys() { - keys = append(keys, k) - } - sort.Strings(keys) - - buf := bytes.NewBufferString("{") - for _, key := range keys { - val, _ := c.psMap.Lookup(key) - fmt.Fprintf(buf, "%s: %v, ", key, val) - } - fmt.Fprintf(buf, "}") - return buf.String() + return mapToString(c.psMap) } // DeepEqual tests equality with other Counters diff --git a/report/sets.go b/report/sets.go index 183ada1de..59e67270c 100644 --- a/report/sets.go +++ b/report/sets.go @@ -1,10 +1,7 @@ package report import ( - "bytes" - "fmt" "reflect" - "sort" "github.com/ugorji/go/codec" "github.com/weaveworks/ps" @@ -109,22 +106,7 @@ func (s Sets) Copy() Sets { } func (s Sets) String() string { - if s.psMap == nil { - s = EmptySets - } - keys := []string{} - for _, k := range s.psMap.Keys() { - keys = append(keys, k) - } - sort.Strings(keys) - - buf := bytes.NewBufferString("{") - for _, key := range keys { - val, _ := s.psMap.Lookup(key) - fmt.Fprintf(buf, "%s: %v, ", key, val) - } - fmt.Fprintf(buf, "}") - return buf.String() + return mapToString(s.psMap) } // DeepEqual tests equality with other Sets