7
7
"go/token"
8
8
"os"
9
9
"reflect"
10
- "strings"
11
10
"sync"
12
11
13
12
"github.com/BurntSushi/toml"
@@ -183,7 +182,6 @@ func getReviveConfig(cfg *config.ReviveSettings) (*lint.Config, error) {
183
182
}
184
183
185
184
normalizeConfig (conf )
186
- ignoreRules (conf )
187
185
188
186
reviveDebugf ("revive configuration: %#v" , conf )
189
187
@@ -252,23 +250,23 @@ func safeTomlSlice(r []interface{}) []interface{} {
252
250
// This element is not exported by revive, so we need copy the code.
253
251
// Extracted from https://github.com/mgechev/revive/blob/v1.1.4/config/config.go#L15
254
252
var defaultRules = []lint.Rule {
255
- // &rule.VarDeclarationsRule{}, // TODO(ldez) https://github.com/golangci/golangci-lint/issues/2997 (var-declaration)
253
+ & rule.VarDeclarationsRule {},
256
254
& rule.PackageCommentsRule {},
257
255
& rule.DotImportsRule {},
258
256
& rule.BlankImportsRule {},
259
257
& rule.ExportedRule {},
260
258
& rule.VarNamingRule {},
261
259
& rule.IndentErrorFlowRule {},
262
260
& rule.RangeRule {},
263
- // &rule.ErrorfRule{}, // TODO(ldez) https://github.com/golangci/golangci-lint/issues/2997 (errorf
261
+ & rule.ErrorfRule {},
264
262
& rule.ErrorNamingRule {},
265
263
& rule.ErrorStringsRule {},
266
264
& rule.ReceiverNamingRule {},
267
265
& rule.IncrementDecrementRule {},
268
266
& rule.ErrorReturnRule {},
269
- // &rule.UnexportedReturnRule{}, // TODO(ldez) https://github.com/golangci/golangci-lint/issues/2997 (unexported-return)
270
- // &rule.TimeNamingRule{}, // TODO(ldez) https://github.com/golangci/golangci-lint/issues/2997 (time-naming)
271
- // &rule.ContextKeysType{}, // TODO(ldez) https://github.com/golangci/golangci-lint/issues/2997 (context-keys-type)
267
+ & rule.UnexportedReturnRule {},
268
+ & rule.TimeNamingRule {},
269
+ & rule.ContextKeysType {},
272
270
& rule.ContextAsArgumentRule {},
273
271
}
274
272
@@ -289,15 +287,15 @@ var allRules = append([]lint.Rule{
289
287
& rule.FlagParamRule {},
290
288
& rule.UnnecessaryStmtRule {},
291
289
& rule.StructTagRule {},
292
- // &rule.ModifiesValRecRule{}, // TODO(ldez) https://github.com/golangci/golangci-lint/issues/2997 (modifies-value-receiver)
290
+ & rule.ModifiesValRecRule {},
293
291
& rule.ConstantLogicalExprRule {},
294
292
& rule.BoolLiteralRule {},
295
293
& rule.RedefinesBuiltinIDRule {},
296
294
& rule.ImportsBlacklistRule {},
297
295
& rule.FunctionResultsLimitRule {},
298
296
& rule.MaxPublicStructsRule {},
299
297
& rule.RangeValInClosureRule {},
300
- // &rule.RangeValAddress{}, // TODO(ldez) https://github.com/golangci/golangci-lint/issues/2997 (range-val-address)
298
+ & rule.RangeValAddress {},
301
299
& rule.WaitGroupByValueRule {},
302
300
& rule.AtomicRule {},
303
301
& rule.EmptyLinesRule {},
@@ -307,9 +305,9 @@ var allRules = append([]lint.Rule{
307
305
& rule.ImportShadowingRule {},
308
306
& rule.BareReturnRule {},
309
307
& rule.UnusedReceiverRule {},
310
- // &rule.UnhandledErrorRule{}, // TODO(ldez) https://github.com/golangci/golangci-lint/issues/2997 (unhandled-error)
308
+ & rule.UnhandledErrorRule {},
311
309
& rule.CognitiveComplexityRule {},
312
- // &rule.StringOfIntRule{}, // TODO(ldez) https://github.com/golangci/golangci-lint/issues/2997 (string-of-int)
310
+ & rule.StringOfIntRule {},
313
311
& rule.StringFormatRule {},
314
312
& rule.EarlyReturnRule {},
315
313
& rule.UnconditionalRecursionRule {},
@@ -320,9 +318,10 @@ var allRules = append([]lint.Rule{
320
318
& rule.NestedStructs {},
321
319
& rule.IfReturnRule {},
322
320
& rule.UselessBreak {},
323
- // &rule.TimeEqualRule{}, // TODO(ldez) https://github.com/golangci/golangci-lint/issues/2997 (time-equal)
321
+ & rule.TimeEqualRule {},
324
322
& rule.BannedCharsRule {},
325
323
& rule.OptimizeOperandsOrderRule {},
324
+ & rule.DataRaceRule {},
326
325
}, defaultRules ... )
327
326
328
327
const defaultConfidence = 0.8
@@ -386,33 +385,3 @@ func defaultConfig() *lint.Config {
386
385
}
387
386
return & defaultConfig
388
387
}
389
-
390
- // TODO(ldez) https://github.com/golangci/golangci-lint/issues/2997
391
- func ignoreRules (conf * lint.Config ) {
392
- f := []string {
393
- "context-keys-type" ,
394
- "errorf" ,
395
- "modifies-value-receiver" ,
396
- "range-val-address" ,
397
- "string-of-int" ,
398
- "time-equal" ,
399
- "time-naming" ,
400
- "unexported-return" ,
401
- "unhandled-error" ,
402
- "var-declaration" ,
403
- }
404
-
405
- var ignored []string
406
- for _ , s := range f {
407
- if _ , ok := conf .Rules [s ]; ok {
408
- delete (conf .Rules , s )
409
- ignored = append (ignored , s )
410
- }
411
- }
412
-
413
- if len (ignored ) > 0 {
414
- linterLogger .Warnf ("revive: the following rules (%s) are ignored due to a performance problem " +
415
- "(https://github.com/golangci/golangci-lint/issues/2997)" ,
416
- strings .Join (ignored , "," ))
417
- }
418
- }
0 commit comments