Fix logcli.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

cmd/logcli/query.go

@@ -8,10 +8,10 @@ import (
 
 	"github.com/fatih/color"
 	"github.com/prometheus/prometheus/pkg/labels"
+	"github.com/prometheus/prometheus/promql"
 
 	"github.com/grafana/loki/pkg/iter"
 	"github.com/grafana/loki/pkg/logproto"
-	"github.com/grafana/loki/pkg/parser"
 )
 
 func doQuery() {
@@ -92,7 +92,7 @@ func padLabel(ls labels.Labels, maxLabelsLen int) string {
 }
 
 func mustParseLabels(labels string) labels.Labels {
-	ls, err := parser.Labels(labels)
+	ls, err := promql.ParseMetric(labels)
 	if err != nil {
 		log.Fatalf("Failed to parse labels: %+v", err)
 	}

pkg/promtail/promtail_test.go

@@ -12,8 +12,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/prometheus/prometheus/promql"
-
 	"github.com/cortexproject/cortex/pkg/util"
 	"github.com/cortexproject/cortex/pkg/util/flagext"
 	"github.com/go-kit/kit/log"
@@ -24,6 +22,7 @@ import (
 	"github.com/prometheus/prometheus/discovery/targetgroup"
 	"github.com/prometheus/prometheus/pkg/labels"
 	"github.com/prometheus/prometheus/pkg/textparse"
+	"github.com/prometheus/prometheus/promql"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/grafana/loki/pkg/logproto"