From b15dda9e07486b787ebd93420640ca80d3fe07a0 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Wed, 11 Dec 2019 15:45:26 +0100 Subject: [PATCH] util/promlint: simplify sorting function (#6448) Signed-off-by: Simon Pasquier --- util/promlint/promlint.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/util/promlint/promlint.go b/util/promlint/promlint.go index 0a384f993..4570c6060 100644 --- a/util/promlint/promlint.go +++ b/util/promlint/promlint.go @@ -85,13 +85,10 @@ func (l *Linter) Lint() ([]Problem, error) { // Ensure deterministic output. sort.SliceStable(problems, func(i, j int) bool { - if problems[i].Metric < problems[j].Metric { - return true - } else if problems[i].Metric > problems[j].Metric { - return false + if problems[i].Metric == problems[j].Metric { + return problems[i].Text < problems[j].Text } - - return problems[i].Text < problems[j].Text + return problems[i].Metric < problems[j].Metric }) return problems, nil