chore: clean internal package

Author: ldez

go.mod

@@ -75,7 +75,6 @@ require (
 	github.com/nishanths/exhaustive v0.9.5
 	github.com/nishanths/predeclared v0.2.2
 	github.com/nunnatsa/ginkgolinter v0.8.1
-	github.com/pkg/errors v0.9.1
 	github.com/polyfloyd/go-errorlint v1.1.0
 	github.com/quasilyte/go-ruleguard/dsl v0.3.22
 	github.com/ryancurrah/gomodguard v1.3.0
@@ -154,6 +153,7 @@ require (
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/prometheus/client_golang v1.12.1 // indirect

internal/cache/cache.go

@@ -12,6 +12,7 @@ import (
 	"bytes"
 	"crypto/sha256"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -20,8 +21,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pkg/errors"
-
 	"github.com/golangci/golangci-lint/internal/renameio"
 	"github.com/golangci/golangci-lint/internal/robustio"
 )
@@ -80,7 +79,7 @@ func (c *Cache) fileName(id [HashSize]byte, key string) string {
 var errMissing = errors.New("cache entry not found")
 
 func IsErrMissing(err error) bool {
-	return errors.Cause(err) == errMissing
+	return errors.Is(err, errMissing)
 }
 
 const (
@@ -169,10 +168,10 @@ func (c *Cache) get(id ActionID) (Entry, error) {
 	etime := entry[1 : 1+20]
 	var buf [HashSize]byte
 	if _, err = hex.Decode(buf[:], eid); err != nil || buf != id {
-		return failed(errors.Wrapf(err, "failed to hex decode eid data in %s", fileName))
+		return failed(fmt.Errorf("failed to hex decode eid data in %s: %w", fileName, err))
 	}
 	if _, err = hex.Decode(buf[:], eout); err != nil {
-		return failed(errors.Wrapf(err, "failed to hex decode eout data in %s", fileName))
+		return failed(fmt.Errorf("failed to hex decode eout data in %s: %w", fileName, err))
 	}
 	i := 0
 	for i < len(esize) && esize[i] == ' ' {
@@ -192,7 +191,7 @@ func (c *Cache) get(id ActionID) (Entry, error) {
 	}
 
 	if err = c.used(fileName); err != nil {
-		return failed(errors.Wrapf(err, "failed to mark %s as used", fileName))
+		return failed(fmt.Errorf("failed to mark %s as used: %w", fileName, err))
 	}
 
 	return Entry{buf, size, time.Unix(0, tm)}, nil
@@ -264,15 +263,15 @@ func (c *Cache) used(file string) error {
 		if os.IsNotExist(err) {
 			return errMissing
 		}
-		return errors.Wrapf(err, "failed to stat file %s", file)
+		return fmt.Errorf("failed to stat file %s: %w", file, err)
 	}
 
 	if c.now().Sub(info.ModTime()) < mtimeInterval {
 		return nil
 	}
 
 	if err := os.Chtimes(file, c.now(), c.now()); err != nil {
-		return errors.Wrapf(err, "failed to change time of file %s", file)
+		return fmt.Errorf("failed to change time of file %s: %w", file, err)
 	}
 
 	return nil
@@ -385,7 +384,7 @@ func (c *Cache) putIndexEntry(id ActionID, out OutputID, size int64, allowVerify
 		return err
 	}
 	if err = os.Chtimes(file, c.now(), c.now()); err != nil { // mainly for tests
-		return errors.Wrapf(err, "failed to change time of file %s", file)
+		return fmt.Errorf("failed to change time of file %s: %w", file, err)
 	}
 
 	return nil
@@ -443,7 +442,7 @@ func (c *Cache) copyFile(file io.ReadSeeker, out OutputID, size int64) error {
 		if f, openErr := os.Open(name); openErr == nil {
 			h := sha256.New()
 			if _, copyErr := io.Copy(h, f); copyErr != nil {
-				return errors.Wrap(copyErr, "failed to copy to sha256")
+				return fmt.Errorf("failed to copy to sha256: %w", copyErr)
 			}
 
 			f.Close()
@@ -519,7 +518,7 @@ func (c *Cache) copyFile(file io.ReadSeeker, out OutputID, size int64) error {
 		return err
 	}
 	if err = os.Chtimes(name, c.now(), c.now()); err != nil { // mainly for tests
-		return errors.Wrapf(err, "failed to change time of file %s", name)
+		return fmt.Errorf("failed to change time of file %s: %w", name, err)
 	}
 
 	return nil

internal/pkgcache/pkgcache.go

@@ -4,12 +4,12 @@ import (
 	"bytes"
 	"encoding/gob"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"runtime"
 	"sort"
 	"sync"
 
-	"github.com/pkg/errors"
 	"golang.org/x/tools/go/packages"
 
 	"github.com/golangci/golangci-lint/internal/cache"
@@ -61,7 +61,7 @@ func (c *Cache) Put(pkg *packages.Package, mode HashMode, key string, data inter
 		err = gob.NewEncoder(buf).Encode(data)
 	})
 	if err != nil {
-		return errors.Wrap(err, "failed to gob encode")
+		return fmt.Errorf("failed to gob encode: %w", err)
 	}
 
 	var aID cache.ActionID
@@ -71,21 +71,21 @@ func (c *Cache) Put(pkg *packages.Package, mode HashMode, key string, data inter
 		if err == nil {
 			subkey, subkeyErr := cache.Subkey(aID, key)
 			if subkeyErr != nil {
-				err = errors.Wrap(subkeyErr, "failed to build subkey")
+				err = fmt.Errorf("failed to build subkey: %w", subkeyErr)
 			}
 			aID = subkey
 		}
 	})
 	if err != nil {
-		return errors.Wrapf(err, "failed to calculate package %s action id", pkg.Name)
+		return fmt.Errorf("failed to calculate package %s action id: %w", pkg.Name, err)
 	}
 	c.ioSem <- struct{}{}
 	c.sw.TrackStage("cache io", func() {
 		err = c.lowLevelCache.PutBytes(aID, buf.Bytes())
 	})
 	<-c.ioSem
 	if err != nil {
-		return errors.Wrapf(err, "failed to save data to low-level cache by key %s for package %s", key, pkg.Name)
+		return fmt.Errorf("failed to save data to low-level cache by key %s for package %s: %w", key, pkg.Name, err)
 	}
 
 	return nil
@@ -101,13 +101,13 @@ func (c *Cache) Get(pkg *packages.Package, mode HashMode, key string, data inter
 		if err == nil {
 			subkey, subkeyErr := cache.Subkey(aID, key)
 			if subkeyErr != nil {
-				err = errors.Wrap(subkeyErr, "failed to build subkey")
+				err = fmt.Errorf("failed to build subkey: %w", subkeyErr)
 			}
 			aID = subkey
 		}
 	})
 	if err != nil {
-		return errors.Wrapf(err, "failed to calculate package %s action id", pkg.Name)
+		return fmt.Errorf("failed to calculate package %s action id: %w", pkg.Name, err)
 	}
 
 	var b []byte
@@ -120,14 +120,14 @@ func (c *Cache) Get(pkg *packages.Package, mode HashMode, key string, data inter
 		if cache.IsErrMissing(err) {
 			return ErrMissing
 		}
-		return errors.Wrapf(err, "failed to get data from low-level cache by key %s for package %s", key, pkg.Name)
+		return fmt.Errorf("failed to get data from low-level cache by key %s for package %s: %w", key, pkg.Name, err)
 	}
 
 	c.sw.TrackStage("gob", func() {
 		err = gob.NewDecoder(bytes.NewReader(b)).Decode(data)
 	})
 	if err != nil {
-		return errors.Wrap(err, "failed to gob decode")
+		return fmt.Errorf("failed to gob decode: %w", err)
 	}
 
 	return nil
@@ -136,12 +136,12 @@ func (c *Cache) Get(pkg *packages.Package, mode HashMode, key string, data inter
 func (c *Cache) pkgActionID(pkg *packages.Package, mode HashMode) (cache.ActionID, error) {
 	hash, err := c.packageHash(pkg, mode)
 	if err != nil {
-		return cache.ActionID{}, errors.Wrap(err, "failed to get package hash")
+		return cache.ActionID{}, fmt.Errorf("failed to get package hash: %w", err)
 	}
 
 	key, err := cache.NewHash("action ID")
 	if err != nil {
-		return cache.ActionID{}, errors.Wrap(err, "failed to make a hash")
+		return cache.ActionID{}, fmt.Errorf("failed to make a hash: %w", err)
 	}
 	fmt.Fprintf(key, "pkgpath %s\n", pkg.PkgPath)
 	fmt.Fprintf(key, "pkghash %s\n", hash)
@@ -167,7 +167,7 @@ func (c *Cache) packageHash(pkg *packages.Package, mode HashMode) (string, error
 
 	key, err := cache.NewHash("package hash")
 	if err != nil {
-		return "", errors.Wrap(err, "failed to make a hash")
+		return "", fmt.Errorf("failed to make a hash: %w", err)
 	}
 
 	fmt.Fprintf(key, "pkgpath %s\n", pkg.PkgPath)
@@ -176,7 +176,7 @@ func (c *Cache) packageHash(pkg *packages.Package, mode HashMode) (string, error
 		h, fErr := cache.FileHash(f)
 		<-c.ioSem
 		if fErr != nil {
-			return "", errors.Wrapf(fErr, "failed to calculate file %s hash", f)
+			return "", fmt.Errorf("failed to calculate file %s hash: %w", f, fErr)
 		}
 		fmt.Fprintf(key, "file %s %x\n", f, h)
 	}
@@ -199,7 +199,7 @@ func (c *Cache) packageHash(pkg *packages.Package, mode HashMode) (string, error
 
 			depHash, depErr := c.packageHash(dep, depMode)
 			if depErr != nil {
-				return errors.Wrapf(depErr, "failed to calculate hash for dependency %s with mode %d", dep.Name, depMode)
+				return fmt.Errorf("failed to calculate hash for dependency %s with mode %d: %w", dep.Name, depMode, depErr)
 			}
 
 			fmt.Fprintf(key, "import %s %s\n", dep.PkgPath, depHash)