From a278021be56b90e3cc5e3eec1fcff490a86c1d85 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Thu, 7 Dec 2023 15:14:51 +0100 Subject: [PATCH] Removed dependency on `github.com/pkg/errors` --- go.mod | 5 +---- go.sum | 2 -- gzip.go | 11 +++++------ paths.go | 4 +--- process.go | 3 +-- 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 13b814f..05e388f 100644 --- a/go.mod +++ b/go.mod @@ -2,10 +2,7 @@ module github.com/arduino/go-paths-helper go 1.21 -require ( - github.com/pkg/errors v0.9.1 - github.com/stretchr/testify v1.8.4 -) +require github.com/stretchr/testify v1.8.4 require ( github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/go.sum b/go.sum index 57d96e6..fa4b6e6 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= diff --git a/gzip.go b/gzip.go index 3a841ae..d1f4bca 100644 --- a/gzip.go +++ b/gzip.go @@ -31,9 +31,8 @@ package paths import ( "compress/gzip" + "fmt" "io" - - "github.com/pkg/errors" ) // GZip compress src with gzip and writes the compressed file on dst @@ -45,25 +44,25 @@ import ( func GUnzip(src, dest *Path) error { gzIn, err := src.Open() if err != nil { - return errors.Wrap(err, "opening "+src.String()) + return fmt.Errorf("opening %s: %w", src, err) } defer gzIn.Close() in, err := gzip.NewReader(gzIn) if err != nil { - return errors.Wrap(err, "decoding "+src.String()) + return fmt.Errorf("decoding %s: %w", src, err) } defer in.Close() out, err := dest.Create() if err != nil { - return errors.Wrap(err, "creating "+dest.String()) + return fmt.Errorf("creating %s: %w", dest, err) } defer out.Close() _, err = io.Copy(out, in) if err != nil { - return errors.Wrap(err, "uncompressing "+dest.String()) + return fmt.Errorf("uncompressing %s: %w", dest, err) } return nil diff --git a/paths.go b/paths.go index c0c1e4b..7fb644d 100644 --- a/paths.go +++ b/paths.go @@ -38,8 +38,6 @@ import ( "strings" "syscall" "time" - - "github.com/pkg/errors" ) // Path represents a path @@ -442,7 +440,7 @@ func WriteToTempFile(data []byte, dir *Path, prefix string) (res *Path, err erro if n, err := f.Write(data); err != nil { return nil, err } else if n < len(data) { - return nil, errors.Errorf("could not write all data (written %d bytes out of %d)", n, len(data)) + return nil, fmt.Errorf("could not write all data (written %d bytes out of %d)", n, len(data)) } return New(f.Name()), nil } diff --git a/process.go b/process.go index 2198e72..4c86928 100644 --- a/process.go +++ b/process.go @@ -32,11 +32,10 @@ package paths import ( "bytes" "context" + "errors" "io" "os" "os/exec" - - "github.com/pkg/errors" ) // Process is representation of an external process run