Update errcheck after kisielk/errcheck#185 is merged

Author: leventov

go.mod

@@ -34,6 +34,7 @@ require (
 	github.com/kunwardeep/paralleltest v1.0.2
 	github.com/kyoh86/exportloopref v0.1.8
 	github.com/kisielk/errcheck v1.4.1-0.20200802052755-ea6ea2fa7078
+	github.com/kisielk/errcheck v1.5.0-alpha.0.20201210184435-7e1276f76cf6
 	github.com/kyoh86/exportloopref v0.1.7
 	github.com/maratori/testpackage v1.0.1
 	github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb // v1.0
@@ -78,5 +79,3 @@ require (
 	mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
 	mvdan.cc/unparam v0.0.0-20200501210554-b37ab49443f7
 )
-
-replace github.com/kisielk/errcheck => /Users/[email protected]/icloud/projects/errcheck

go.sum

@@ -42,7 +42,6 @@ func NewErrcheck() *goanalysis.Linter {
 		if err != nil {
 			panic(err.Error())
 		}
-		checker.Verbose = lintCtx.Cfg.Run.IsVerbose
 		checker.Tags = lintCtx.Cfg.Run.BuildTags
 
 		analyzer.Run = func(pass *analysis.Pass) (interface{}, error) {
@@ -54,12 +53,12 @@ func NewErrcheck() *goanalysis.Linter {
 			}
 
 			errcheckIssues := checker.CheckPackage(pkg)
-			if len(errcheckIssues) == 0 {
+			if len(errcheckIssues.UncheckedErrors) == 0 {
 				return nil, nil
 			}
 
-			issues := make([]goanalysis.Issue, 0, len(errcheckIssues))
-			for _, i := range errcheckIssues {
+			issues := make([]goanalysis.Issue, 0, len(errcheckIssues.UncheckedErrors))
+			for _, i := range errcheckIssues.UncheckedErrors {
 				var text string
 				if i.FuncName != "" {
 					text = fmt.Sprintf("Error return value of %s is not checked", formatCode(i.FuncName, lintCtx.Cfg))
@@ -112,31 +111,30 @@ func parseIgnoreConfig(s string) (map[string]*regexp.Regexp, error) {
 }
 
 func getChecker(errCfg *config.ErrcheckSettings) (*errcheck.Checker, error) {
-	checker := errcheck.NewChecker()
-	checker.Blank = errCfg.CheckAssignToBlank
-	checker.Asserts = errCfg.CheckTypeAssertions
+	var checker errcheck.Checker
+	checker.Exclusions.BlankAssignments = !errCfg.CheckAssignToBlank
+	checker.Exclusions.TypeAssertions = !errCfg.CheckTypeAssertions
 
 	ignoreConfig, err := parseIgnoreConfig(errCfg.Ignore)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to parse 'ignore' directive")
 	}
 
-	checker.Ignore = map[string]*regexp.Regexp{}
+	checker.Exclusions.SymbolRegexpsByPackage = map[string]*regexp.Regexp{}
 	for pkg, re := range ignoreConfig {
-		checker.Ignore[pkg] = re
+		checker.Exclusions.SymbolRegexpsByPackage[pkg] = re
 	}
-	checker.UpdateNonVendoredIgnore()
 
-	checker.AddExcludes(errcheck.DefaultExcludes)
+	checker.Exclusions.Symbols = append([]string{}, errcheck.DefaultExcludedSymbols...)
 	if errCfg.Exclude != "" {
 		exclude, err := readExcludeFile(errCfg.Exclude)
 		if err != nil {
 			return nil, err
 		}
-		checker.AddExcludes(exclude)
+		checker.Exclusions.Symbols = append(checker.Exclusions.Symbols, exclude...)
 	}
 
-	return checker, nil
+	return &checker, nil
 }
 
 func getFirstPathArg() string {

pkg/golinters/errcheck.go

@@ -13,6 +13,6 @@ func TestErrcheckExclude() []byte {
 }
 
 func TestErrcheckNoExclude() []byte {
-	ret, _ := ioutil.ReadAll(nil) // ERROR "Error return value is not checked"
+	ret, _ := ioutil.ReadAll(nil) // ERROR "Error return value of `io/ioutil.ReadAll` is not checked"
 	return ret
 }

test/testdata/errcheck_exclude.go

@@ -12,8 +12,8 @@ func TestErrcheckIgnoreOs() {
 	_, _ = os.Open("f.txt")
 }
 
-func TestErrcheckNoIgnoreFmt(s string) int {
-	n, _ := fmt.Println(s) // ERROR "Error return value is not checked"
+func TestErrcheckIgnoreFmt(s string) int {
+	n, _ := fmt.Println(s)
 	return n
 }
 
@@ -23,6 +23,6 @@ func TestErrcheckIgnoreIoutil() []byte {
 }
 
 func TestErrcheckNoIgnoreIoutil() []byte {
-	ret, _ := ioutil.ReadAll(nil) // ERROR "Error return value is not checked"
+	ret, _ := ioutil.ReadAll(nil) // ERROR "Error return value of `io/ioutil.ReadAll` is not checked"
 	return ret
 }

test/testdata/errcheck_ignore.go

@@ -20,5 +20,5 @@ func TestErrcheckIgnoreFmtByDefault(s string) int {
 }
 
 func TestErrcheckNoIgnoreOs() {
-	_, _ = os.Open("f.txt") // ERROR "Error return value is not checked"
+	_, _ = os.Open("f.txt") // ERROR "Error return value of `os.Open` is not checked"
 }