From 8f55c74b27037986447355818db51c437bb9f018 Mon Sep 17 00:00:00 2001 From: Peter Bourgon Date: Wed, 26 Aug 2015 09:45:42 +0100 Subject: [PATCH] xfer: fixes for new merge semantics --- xfer/collector.go | 6 +++--- xfer/collector_test.go | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xfer/collector.go b/xfer/collector.go index a19d684ac..5155f4c96 100644 --- a/xfer/collector.go +++ b/xfer/collector.go @@ -52,11 +52,11 @@ func (c *Collector) Report() report.Report { c.reports = clean(c.reports, c.window) - report := report.MakeReport() + rpt := report.MakeReport() for _, tr := range c.reports { - report.Merge(tr.report) + rpt = rpt.Merge(tr.report) } - return report + return rpt } type timestampReport struct { diff --git a/xfer/collector_test.go b/xfer/collector_test.go index f8fc98508..1025b09d8 100644 --- a/xfer/collector_test.go +++ b/xfer/collector_test.go @@ -32,9 +32,10 @@ func TestCollector(t *testing.T) { } c.Add(r2) + merged := report.MakeReport() - merged.Merge(r1) - merged.Merge(r2) + merged = merged.Merge(r1) + merged = merged.Merge(r2) if want, have := merged, c.Report(); !reflect.DeepEqual(want, have) { t.Error(test.Diff(want, have)) }