Skip to content

Commit ea51f7a

Browse files
authored
fix issue #537 (#538)
1 parent cfac8b0 commit ea51f7a

File tree

5 files changed

+14
-3
lines changed

5 files changed

+14
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ List of all available rules. The rules ported from `golint` are left unchanged a
401401
| [`error-strings`](./RULES_DESCRIPTIONS.md#error-strings) | n/a | Conventions around error strings. | yes | no |
402402
| [`error-naming`](./RULES_DESCRIPTIONS.md#error-naming) | n/a | Naming of error variables. | yes | no |
403403
| [`exported`](./RULES_DESCRIPTIONS.md#exported) | n/a | Naming and commenting conventions on exported symbols. | yes | no |
404-
| [`if-return`](./RULES_DESCRIPTIONS.md#if-return) | n/a | Redundant if when returning an error. | yes | no |
404+
| [`if-return`](./RULES_DESCRIPTIONS.md#if-return) | n/a | Redundant if when returning an error. | no | no |
405405
| [`increment-decrement`](./RULES_DESCRIPTIONS.md#increment-decrement) | n/a | Use `i++` and `i--` instead of `i += 1` and `i -= 1`. | yes | no |
406406
| [`var-naming`](./RULES_DESCRIPTIONS.md#var-naming) | whitelist & blacklist of initialisms | Naming rules. | yes | no |
407407
| [`package-comments`](./RULES_DESCRIPTIONS.md#package-comments) | n/a | Package commenting conventions. | yes | no |

config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ var defaultRules = []lint.Rule{
2020
&rule.ExportedRule{},
2121
&rule.VarNamingRule{},
2222
&rule.IndentErrorFlowRule{},
23-
&rule.IfReturnRule{},
2423
&rule.RangeRule{},
2524
&rule.ErrorfRule{},
2625
&rule.ErrorNamingRule{},
@@ -80,6 +79,7 @@ var allRules = append([]lint.Rule{
8079
&rule.UnexportedNamingRule{},
8180
&rule.FunctionLength{},
8281
&rule.NestedStructs{},
82+
&rule.IfReturnRule{},
8383
}, defaultRules...)
8484

8585
var allFormatters = []lint.Formatter{

test/golint_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ var rules = []lint.Rule{
2121
&rule.ExportedRule{},
2222
&rule.VarNamingRule{},
2323
&rule.IndentErrorFlowRule{},
24-
&rule.IfReturnRule{},
2524
&rule.RangeRule{},
2625
&rule.ErrorfRule{},
2726
&rule.ErrorNamingRule{},

test/if-return_test.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package test
2+
3+
import (
4+
"testing"
5+
6+
"github.com/mgechev/revive/rule"
7+
)
8+
9+
// TestIfReturn rule.
10+
func TestIfReturn(t *testing.T) {
11+
testRule(t, "if-return", &rule.IfReturnRule{})
12+
}
File renamed without changes.

0 commit comments

Comments
 (0)