fix several minor golint style issues

This commit is contained in:
Dmitry Savintsev 2016-05-11 14:20:36 +02:00
parent ba87e2d8c1
commit 7fdb62c253
4 changed files with 14 additions and 16 deletions

View File

@ -42,7 +42,7 @@ const (
subsystem = "notifications"
)
// Handler is responsible for dispatching alert notifications to an
// Notifier is responsible for dispatching alert notifications to an
// alert manager service.
type Notifier struct {
queue model.Alerts
@ -61,7 +61,7 @@ type Notifier struct {
queueCapacity prometheus.Metric
}
// HandlerOptions are the configurable parameters of a Handler.
// Options are the configurable parameters of a Handler.
type Options struct {
AlertmanagerURL string
QueueCapacity int

View File

@ -82,8 +82,7 @@ func (i itemType) isSetOperator() bool {
return false
}
// Constants for operator precedence in expressions.
//
// LowestPrec is a constant for operator precedence in expressions.
const LowestPrec = 0 // Non-operators.
// Precedence returns the operator precedence of the binary

View File

@ -512,17 +512,16 @@ func (p *parser) balance(lhs Expr, op itemType, rhs Expr, vecMatching *VectorMat
VectorMatching: lhsBE.VectorMatching,
ReturnBool: lhsBE.ReturnBool,
}
} else {
if op.isComparisonOperator() && !returnBool && rhs.Type() == model.ValScalar && lhs.Type() == model.ValScalar {
p.errorf("comparisons between scalars must use BOOL modifier")
}
return &BinaryExpr{
Op: op,
LHS: lhs,
RHS: rhs,
VectorMatching: vecMatching,
ReturnBool: returnBool,
}
}
if op.isComparisonOperator() && !returnBool && rhs.Type() == model.ValScalar && lhs.Type() == model.ValScalar {
p.errorf("comparisons between scalars must use BOOL modifier")
}
return &BinaryExpr{
Op: op,
LHS: lhs,
RHS: rhs,
VectorMatching: vecMatching,
ReturnBool: returnBool,
}
}

View File

@ -51,7 +51,7 @@ func pathFromMetric(m model.Metric, prefix string) string {
// We want to sort the labels.
labels := make(model.LabelNames, 0, len(m))
for l, _ := range m {
for l := range m {
labels = append(labels, l)
}
sort.Sort(labels)