Merge pull request #131 from mna/cleanup-linting

Update linting to golangci-lint

Author: breml

CONTRIBUTING.md

@@ -22,7 +22,7 @@ For a new feature, it must be thoroughly tested. New code without new test(s) is
 
 Respect the coding style of the repository, which means essentially to respect the [coding guidelines of the Go community][2]. Use `gofmt` to format your code, and `goimports` to add and format the list of imported packages (or do it manually, but in a `goimports`-style).
 
-Once all code is done and tests pass, regenerate the whole tree with `make`, run `make lint` to make sure the code is correct, and run tests again. You are now ready to submit the pull request.
+Once all code is done and tests pass, regenerate the whole tree with `make`, run `make lint` (does need [`golangci-lint`](https://golangci-lint.run/))to make sure the code is correct, and run tests again. You are now ready to submit the pull request.
 
 ## Licensing
 

Makefile

@@ -231,11 +231,7 @@ $(TEST_DIR)/left_recursion_thrownrecover/left_recursion_thrownrecover.go: \
 	$(BINDIR)/pigeon -nolint -support-left-recursion $< > $@
 
 lint:
-	golint ./...
-	go vet ./...
-
-gometalinter:
-	gometalinter ./...
+	golangci-lint run ./...
 
 cmp:
 	@boot=$$(mktemp) && $(BINDIR)/bootstrap-pigeon $(PIGEON_GRAMMAR) > $$boot && \
@@ -252,5 +248,5 @@ clean:
 	rm -f $(BOOTSTRAPPIGEON_DIR)/bootstrap_pigeon.go $(ROOT)/pigeon.go $(TEST_GENERATED_SRC) $(EXAMPLES_DIR)/json/optimized/json.go $(EXAMPLES_DIR)/json/optimized-grammar/json.go $(TEST_DIR)/staterestore/optimized/staterestore.go $(TEST_DIR)/staterestore/standard/staterestore.go $(TEST_DIR)/issue_65/optimized/issue_65.go $(TEST_DIR)/issue_65/optimized-grammar/issue_65.go
 	rm -rf $(BINDIR)
 
-.PHONY: all clean lint gometalinter cmp test
+.PHONY: all clean lint cmp test
 

builder/builder.go

@@ -89,7 +89,7 @@ func SupportLeftRecursion(support bool) Option {
 
 // Nolint returns an option that specifies the nolint option
 // If nolint is true, special '// nolint: ...' comments are added
-// to the generated parser to suppress warnings by gometalinter.
+// to the generated parser to suppress warnings by gometalinter or golangci-lint.
 func Nolint(nolint bool) Option {
 	return func(b *builder) Option {
 		prev := b.nolint

doc.go

@@ -36,7 +36,8 @@ The following options can be specified:
 	-debug : boolean, print debugging info to stdout (default: false).
 
 	-nolint: add '// nolint: ...' comments for generated parser to suppress
-	warnings by gometalinter (https://github.com/alecthomas/gometalinter).
+	warnings by gometalinter (https://github.com/alecthomas/gometalinter) or
+	golangci-lint (https://golangci-lint.run/).
 
 	-no-recover : boolean, if set, do not recover from a panic. Useful
 	to access the panic stack when debugging, otherwise the panic

main.go

@@ -43,7 +43,7 @@ func main() {
 		dbgFlag                = fs.Bool("debug", false, "set debug mode")
 		shortHelpFlag          = fs.Bool("h", false, "show help page")
 		longHelpFlag           = fs.Bool("help", false, "show help page")
-		nolint                 = fs.Bool("nolint", false, "add '// nolint: ...' comments to suppress warnings by gometalinter")
+		nolint                 = fs.Bool("nolint", false, "add '// nolint: ...' comments to suppress warnings by gometalinter or golangci-lint")
 		noRecoverFlag          = fs.Bool("no-recover", false, "do not recover from panic")
 		outputFlag             = fs.String("o", "", "output file, defaults to stdout")
 		optimizeBasicLatinFlag = fs.Bool("optimize-basic-latin", false, "generate optimized parser for Unicode Basic Latin character sets")
@@ -189,7 +189,8 @@ the generated code is written to this file instead.
 		display this help message.
 	-nolint
 		add '// nolint: ...' comments for generated parser to suppress
-		warnings by gometalinter (https://github.com/alecthomas/gometalinter).
+		warnings by gometalinter (https://github.com/alecthomas/gometalinter) or
+		golangci-lint (https://golangci-lint.run/).
 	-no-recover
 		do not recover from a panic. Useful to access the panic stack
 		when debugging, otherwise the panic is converted to an error.