From 4c96e7b79b9bb8207885e8ba63cc19f2d863b75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20Haugen?= Date: Wed, 2 Sep 2015 20:25:46 +0200 Subject: [PATCH] cmd/compile/internal/gc: clean up errcmp Change-Id: Id07811a25bf4aa3ff834e7254a3dfb04522b2926 Reviewed-on: https://go-review.googlesource.com/14174 Reviewed-by: Brad Fitzpatrick Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-by: Dave Cheney --- src/cmd/compile/internal/gc/subr.go | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/cmd/compile/internal/gc/subr.go b/src/cmd/compile/internal/gc/subr.go index f82fed4586..68cee5231d 100644 --- a/src/cmd/compile/internal/gc/subr.go +++ b/src/cmd/compile/internal/gc/subr.go @@ -59,26 +59,21 @@ func adderr(line int, format string, args ...interface{}) { }) } +// errcmp sorts errors by line, then seq, then message. type errcmp []Error -func (x errcmp) Len() int { - return len(x) -} - -func (x errcmp) Swap(i, j int) { - x[i], x[j] = x[j], x[i] -} - +func (x errcmp) Len() int { return len(x) } +func (x errcmp) Swap(i, j int) { x[i], x[j] = x[j], x[i] } func (x errcmp) Less(i, j int) bool { a := &x[i] b := &x[j] if a.lineno != b.lineno { - return a.lineno-b.lineno < 0 + return a.lineno < b.lineno } if a.seq != b.seq { - return a.seq-b.seq < 0 + return a.seq < b.seq } - return stringsCompare(a.msg, b.msg) < 0 + return a.msg < b.msg } func Flusherrors() { @@ -86,7 +81,7 @@ func Flusherrors() { if len(errors) == 0 { return } - sort.Sort(errcmp(errors[:len(errors)])) + sort.Sort(errcmp(errors)) for i := 0; i < len(errors); i++ { if i == 0 || errors[i].msg != errors[i-1].msg { fmt.Printf("%s", errors[i].msg)