Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove patched archive/zip, replace with klauspost's #12

Merged
merged 1 commit into from
Jun 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion archiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"sync"
"sync/atomic"

"github.com/klauspost/compress/zip"
"github.com/saracen/fastzip/internal/filepool"
"github.com/saracen/fastzip/internal/zip"
"golang.org/x/sync/errgroup"
)

Expand Down
2 changes: 1 addition & 1 deletion archiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"strings"
"testing"

"github.com/saracen/fastzip/internal/zip"
"github.com/klauspost/compress/zip"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion archiver_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"syscall"

"github.com/saracen/fastzip/internal/zip"
"github.com/klauspost/compress/zip"
"github.com/saracen/zipextra"
)

Expand Down
2 changes: 1 addition & 1 deletion archiver_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io"
"os"

"github.com/saracen/fastzip/internal/zip"
"github.com/klauspost/compress/zip"
)

func (a *Archiver) createHeader(fi os.FileInfo, hdr *zip.FileHeader) (io.Writer, error) {
Expand Down
2 changes: 1 addition & 1 deletion extractor.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"sync/atomic"
"time"

"github.com/saracen/fastzip/internal/zip"
"github.com/klauspost/compress/zip"
"github.com/saracen/zipextra"
"golang.org/x/sync/errgroup"
)
Expand Down
2 changes: 1 addition & 1 deletion extractor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"testing"

"github.com/saracen/fastzip/internal/zip"
"github.com/klauspost/compress/zip"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/saracen/fastzip
go 1.13

require (
github.com/klauspost/compress v1.10.2
github.com/klauspost/compress v1.10.9-0.20200607082256-01fb7573b37c
github.com/saracen/zipextra v0.0.0-20191018034721-f8fcc2e1b58e
github.com/stretchr/testify v1.4.0
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/klauspost/compress v1.10.2 h1:Znfn6hXZAHaLPNnlqUYRrBSReFHYybslgv4PTiyz6P0=
github.com/klauspost/compress v1.10.2/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
github.com/klauspost/compress v1.10.9-0.20200607082256-01fb7573b37c h1:4LIA4AoZrqzzOiXb+nJQP26uQrIW/fXqYhQR4Foonks=
github.com/klauspost/compress v1.10.9-0.20200607082256-01fb7573b37c/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
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/saracen/zipextra v0.0.0-20191018034721-f8fcc2e1b58e h1:psyRxwoYbvGxzM8WucxDD5TJ994ePVteYpeb4BIZVic=
Expand Down
6 changes: 0 additions & 6 deletions internal/zip/README.md

This file was deleted.

93 changes: 0 additions & 93 deletions internal/zip/example_test.go

This file was deleted.

Loading