Skip to content

Commit 1629613

Browse files
authored
Merge pull request #12 from saracen/klauspost-zip
Remove patched archive/zip, replace with klauspost's
2 parents b5211bf + 957ab96 commit 1629613

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+9
-4178
lines changed

archiver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"sync"
1414
"sync/atomic"
1515

16+
"github.com/klauspost/compress/zip"
1617
"github.com/saracen/fastzip/internal/filepool"
17-
"github.com/saracen/fastzip/internal/zip"
1818
"golang.org/x/sync/errgroup"
1919
)
2020

archiver_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"strings"
1313
"testing"
1414

15-
"github.com/saracen/fastzip/internal/zip"
15+
"github.com/klauspost/compress/zip"
1616
"github.com/stretchr/testify/assert"
1717
"github.com/stretchr/testify/require"
1818
)

archiver_unix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"os"
99
"syscall"
1010

11-
"github.com/saracen/fastzip/internal/zip"
11+
"github.com/klauspost/compress/zip"
1212
"github.com/saracen/zipextra"
1313
)
1414

archiver_windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"io"
77
"os"
88

9-
"github.com/saracen/fastzip/internal/zip"
9+
"github.com/klauspost/compress/zip"
1010
)
1111

1212
func (a *Archiver) createHeader(fi os.FileInfo, hdr *zip.FileHeader) (io.Writer, error) {

extractor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"sync/atomic"
1414
"time"
1515

16-
"github.com/saracen/fastzip/internal/zip"
16+
"github.com/klauspost/compress/zip"
1717
"github.com/saracen/zipextra"
1818
"golang.org/x/sync/errgroup"
1919
)

extractor_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strings"
99
"testing"
1010

11-
"github.com/saracen/fastzip/internal/zip"
11+
"github.com/klauspost/compress/zip"
1212
"github.com/stretchr/testify/assert"
1313
"github.com/stretchr/testify/require"
1414
)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/saracen/fastzip
33
go 1.13
44

55
require (
6-
github.com/klauspost/compress v1.10.2
6+
github.com/klauspost/compress v1.10.9-0.20200607082256-01fb7573b37c
77
github.com/saracen/zipextra v0.0.0-20191018034721-f8fcc2e1b58e
88
github.com/stretchr/testify v1.4.0
99
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
22
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3-
github.com/klauspost/compress v1.10.2 h1:Znfn6hXZAHaLPNnlqUYRrBSReFHYybslgv4PTiyz6P0=
4-
github.com/klauspost/compress v1.10.2/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
3+
github.com/klauspost/compress v1.10.9-0.20200607082256-01fb7573b37c h1:4LIA4AoZrqzzOiXb+nJQP26uQrIW/fXqYhQR4Foonks=
4+
github.com/klauspost/compress v1.10.9-0.20200607082256-01fb7573b37c/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
55
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
66
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
77
github.com/saracen/zipextra v0.0.0-20191018034721-f8fcc2e1b58e h1:psyRxwoYbvGxzM8WucxDD5TJ994ePVteYpeb4BIZVic=

internal/zip/README.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

internal/zip/example_test.go

Lines changed: 0 additions & 93 deletions
This file was deleted.

0 commit comments

Comments
 (0)