more cr suggestions

limiter.go

@@ -86,22 +86,20 @@ func (l *RateLimiter) OnLimit(w http.ResponseWriter, r *http.Request, key string
 	if limit == -1 {
 		return false
 	}
+	setHeader(w, l.headers.Limit, fmt.Sprintf("%d", limit))
 
 	increment, ok := getIncrement(r.Context())
 	if !ok {
 		increment = 1
 	}
+	if increment != 1 {
+		setHeader(w, l.headers.Increment, fmt.Sprintf("%d", increment))
+	}
 	// If the increment is 0, we do not limit
 	if increment == 0 {
 		return false
 	}
 
-	setHeader(w, l.headers.Limit, fmt.Sprintf("%d", limit))
-
-	if increment > 1 {
-		setHeader(w, l.headers.Increment, fmt.Sprintf("%d", increment))
-	}
-
 	l.mu.Lock()
 	_, rateFloat, err := l.calculateRate(key, limit)
 	if err != nil {

limiter_test.go

@@ -141,7 +141,7 @@ func TestResponseHeaders(t *testing.T) {
 			requestsLimit:       5,
 			increments:          []int{0, 0, 0, 0, 0, 0},
 			respCodes:           []int{200, 200, 200, 200, 200, 200},
-			respLimitHeader:     []string{"", "", "", "", "", ""},
+			respLimitHeader:     []string{"5", "5", "5", "5", "5", "5"},
 			respRemainingHeader: []string{"", "", "", "", "", ""},
 		},
 		{