From 003e13face390e860e87afb02ec0669c8d9fbd42 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Sun, 14 Aug 2016 14:54:09 +0100 Subject: [PATCH] cosmetic --- render/render.go | 3 +-- report/edge_metadatas.go | 7 ++----- report/sets.go | 8 ++------ 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/render/render.go b/render/render.go index 9a9078a3e..7c16b8185 100644 --- a/render/render.go +++ b/render/render.go @@ -81,8 +81,7 @@ func (m *Map) Render(rpt report.Report, dct Decorator) report.Nodes { // Rewrite all the nodes according to the map function for _, inRenderable := range input { for _, outRenderable := range m.MapFunc(inRenderable, localNetworks) { - existing, ok := output[outRenderable.ID] - if ok { + if existing, ok := output[outRenderable.ID]; ok { outRenderable = outRenderable.Merge(existing) } diff --git a/report/edge_metadatas.go b/report/edge_metadatas.go index fd8d7a448..67dc95587 100644 --- a/report/edge_metadatas.go +++ b/report/edge_metadatas.go @@ -39,16 +39,13 @@ func (c EdgeMetadatas) Add(key string, value EdgeMetadata) EdgeMetadatas { if existingValue, ok := c.psMap.Lookup(key); ok { value = value.Merge(existingValue.(EdgeMetadata)) } - return EdgeMetadatas{ - c.psMap.Set(key, value), - } + return EdgeMetadatas{c.psMap.Set(key, value)} } // Lookup the counter 'key' func (c EdgeMetadatas) Lookup(key string) (EdgeMetadata, bool) { if c.psMap != nil { - existingValue, ok := c.psMap.Lookup(key) - if ok { + if existingValue, ok := c.psMap.Lookup(key); ok { return existingValue.(EdgeMetadata), true } } diff --git a/report/sets.go b/report/sets.go index bd363e95e..582899c48 100644 --- a/report/sets.go +++ b/report/sets.go @@ -41,9 +41,7 @@ func (s Sets) Add(key string, value StringSet) Sets { if existingValue, ok := s.psMap.Lookup(key); ok { value = value.Merge(existingValue.(StringSet)) } - return Sets{ - psMap: s.psMap.Set(key, value), - } + return Sets{psMap: s.psMap.Set(key, value)} } // Delete the given set from the Sets. @@ -51,9 +49,7 @@ func (s Sets) Delete(key string) Sets { if s.psMap == nil { return EmptySets } - return Sets{ - psMap: s.psMap.Delete(key), - } + return Sets{psMap: s.psMap.Delete(key)} } // Lookup returns the sets stored under key.