Updated transitive dependencies
This commit is contained in:
parent
43a8d43f0c
commit
d7af8c0efb
4
go.mod
4
go.mod
|
@ -5,7 +5,7 @@ go 1.22
|
||||||
require (
|
require (
|
||||||
github.com/alecthomas/chroma/v2 v2.13.0
|
github.com/alecthomas/chroma/v2 v2.13.0
|
||||||
github.com/julienschmidt/httprouter v1.3.0
|
github.com/julienschmidt/httprouter v1.3.0
|
||||||
github.com/klauspost/compress v1.17.7
|
github.com/klauspost/compress v1.17.8
|
||||||
github.com/spf13/cobra v1.8.0
|
github.com/spf13/cobra v1.8.0
|
||||||
github.com/yosssi/gohtml v0.0.0-20201013000340-ee4748c638f4
|
github.com/yosssi/gohtml v0.0.0-20201013000340-ee4748c638f4
|
||||||
golang.org/x/image v0.15.0
|
golang.org/x/image v0.15.0
|
||||||
|
@ -15,5 +15,5 @@ require (
|
||||||
github.com/dlclark/regexp2 v1.11.0 // indirect
|
github.com/dlclark/regexp2 v1.11.0 // indirect
|
||||||
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
||||||
github.com/spf13/pflag v1.0.5 // indirect
|
github.com/spf13/pflag v1.0.5 // indirect
|
||||||
golang.org/x/net v0.22.0 // indirect
|
golang.org/x/net v0.24.0 // indirect
|
||||||
)
|
)
|
||||||
|
|
8
go.sum
8
go.sum
|
@ -13,8 +13,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
|
||||||
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
|
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
|
||||||
github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
|
github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
|
||||||
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
|
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
|
||||||
github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
|
github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
|
||||||
github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
|
github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
|
||||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
||||||
github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
|
github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
|
||||||
github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
|
github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
|
||||||
|
@ -24,7 +24,7 @@ github.com/yosssi/gohtml v0.0.0-20201013000340-ee4748c638f4 h1:0sw0nJM544SpsihWx
|
||||||
github.com/yosssi/gohtml v0.0.0-20201013000340-ee4748c638f4/go.mod h1:+ccdNT0xMY1dtc5XBxumbYfOUhmduiGudqaDgD2rVRE=
|
github.com/yosssi/gohtml v0.0.0-20201013000340-ee4748c638f4/go.mod h1:+ccdNT0xMY1dtc5XBxumbYfOUhmduiGudqaDgD2rVRE=
|
||||||
golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
|
golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
|
||||||
golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
|
golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
|
||||||
golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
|
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
|
||||||
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
|
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
|
|
@ -55,6 +55,10 @@ https://github.com/klauspost/compress/pull/919 https://github.com/klauspost/comp
|
||||||
* s2: Do 2 overlapping match checks https://github.com/klauspost/compress/pull/839
|
* s2: Do 2 overlapping match checks https://github.com/klauspost/compress/pull/839
|
||||||
* flate: Add amd64 assembly matchlen https://github.com/klauspost/compress/pull/837
|
* flate: Add amd64 assembly matchlen https://github.com/klauspost/compress/pull/837
|
||||||
* gzip: Copy bufio.Reader on Reset by @thatguystone in https://github.com/klauspost/compress/pull/860
|
* gzip: Copy bufio.Reader on Reset by @thatguystone in https://github.com/klauspost/compress/pull/860
|
||||||
|
|
||||||
|
<details>
|
||||||
|
<summary>See changes to v1.16.x</summary>
|
||||||
|
|
||||||
|
|
||||||
* July 1st, 2023 - [v1.16.7](https://github.com/klauspost/compress/releases/tag/v1.16.7)
|
* July 1st, 2023 - [v1.16.7](https://github.com/klauspost/compress/releases/tag/v1.16.7)
|
||||||
* zstd: Fix default level first dictionary encode https://github.com/klauspost/compress/pull/829
|
* zstd: Fix default level first dictionary encode https://github.com/klauspost/compress/pull/829
|
||||||
|
@ -93,6 +97,7 @@ https://github.com/klauspost/compress/pull/919 https://github.com/klauspost/comp
|
||||||
* s2: Add LZ4 block converter. https://github.com/klauspost/compress/pull/748
|
* s2: Add LZ4 block converter. https://github.com/klauspost/compress/pull/748
|
||||||
* s2: Support io.ReaderAt in ReadSeeker. https://github.com/klauspost/compress/pull/747
|
* s2: Support io.ReaderAt in ReadSeeker. https://github.com/klauspost/compress/pull/747
|
||||||
* s2c/s2sx: Use concurrent decoding. https://github.com/klauspost/compress/pull/746
|
* s2c/s2sx: Use concurrent decoding. https://github.com/klauspost/compress/pull/746
|
||||||
|
</details>
|
||||||
|
|
||||||
<details>
|
<details>
|
||||||
<summary>See changes to v1.15.x</summary>
|
<summary>See changes to v1.15.x</summary>
|
||||||
|
@ -560,6 +565,8 @@ the stateless compress described below.
|
||||||
|
|
||||||
For compression performance, see: [this spreadsheet](https://docs.google.com/spreadsheets/d/1nuNE2nPfuINCZJRMt6wFWhKpToF95I47XjSsc-1rbPQ/edit?usp=sharing).
|
For compression performance, see: [this spreadsheet](https://docs.google.com/spreadsheets/d/1nuNE2nPfuINCZJRMt6wFWhKpToF95I47XjSsc-1rbPQ/edit?usp=sharing).
|
||||||
|
|
||||||
|
To disable all assembly add `-tags=noasm`. This works across all packages.
|
||||||
|
|
||||||
# Stateless compression
|
# Stateless compression
|
||||||
|
|
||||||
This package offers stateless compression as a special option for gzip/deflate.
|
This package offers stateless compression as a special option for gzip/deflate.
|
||||||
|
|
|
@ -51,7 +51,7 @@ func emitCopy(dst []byte, offset, length int) int {
|
||||||
i := 0
|
i := 0
|
||||||
// The maximum length for a single tagCopy1 or tagCopy2 op is 64 bytes. The
|
// The maximum length for a single tagCopy1 or tagCopy2 op is 64 bytes. The
|
||||||
// threshold for this loop is a little higher (at 68 = 64 + 4), and the
|
// threshold for this loop is a little higher (at 68 = 64 + 4), and the
|
||||||
// length emitted down below is is a little lower (at 60 = 64 - 4), because
|
// length emitted down below is a little lower (at 60 = 64 - 4), because
|
||||||
// it's shorter to encode a length 67 copy as a length 60 tagCopy2 followed
|
// it's shorter to encode a length 67 copy as a length 60 tagCopy2 followed
|
||||||
// by a length 7 tagCopy1 (which encodes as 3+2 bytes) than to encode it as
|
// by a length 7 tagCopy1 (which encodes as 3+2 bytes) than to encode it as
|
||||||
// a length 64 tagCopy2 followed by a length 3 tagCopy2 (which encodes as
|
// a length 64 tagCopy2 followed by a length 3 tagCopy2 (which encodes as
|
||||||
|
|
|
@ -554,6 +554,9 @@ func (b *blockDec) prepareSequences(in []byte, hist *history) (err error) {
|
||||||
if debugDecoder {
|
if debugDecoder {
|
||||||
printf("Compression modes: 0b%b", compMode)
|
printf("Compression modes: 0b%b", compMode)
|
||||||
}
|
}
|
||||||
|
if compMode&3 != 0 {
|
||||||
|
return errors.New("corrupt block: reserved bits not zero")
|
||||||
|
}
|
||||||
for i := uint(0); i < 3; i++ {
|
for i := uint(0); i < 3; i++ {
|
||||||
mode := seqCompMode((compMode >> (6 - i*2)) & 3)
|
mode := seqCompMode((compMode >> (6 - i*2)) & 3)
|
||||||
if debugDecoder {
|
if debugDecoder {
|
||||||
|
|
|
@ -427,6 +427,16 @@ func (b *blockEnc) encodeLits(lits []byte, raw bool) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// encodeRLE will encode an RLE block.
|
||||||
|
func (b *blockEnc) encodeRLE(val byte, length uint32) {
|
||||||
|
var bh blockHeader
|
||||||
|
bh.setLast(b.last)
|
||||||
|
bh.setSize(length)
|
||||||
|
bh.setType(blockTypeRLE)
|
||||||
|
b.output = bh.appendTo(b.output)
|
||||||
|
b.output = append(b.output, val)
|
||||||
|
}
|
||||||
|
|
||||||
// fuzzFseEncoder can be used to fuzz the FSE encoder.
|
// fuzzFseEncoder can be used to fuzz the FSE encoder.
|
||||||
func fuzzFseEncoder(data []byte) int {
|
func fuzzFseEncoder(data []byte) int {
|
||||||
if len(data) > maxSequences || len(data) < 2 {
|
if len(data) > maxSequences || len(data) < 2 {
|
||||||
|
@ -479,6 +489,16 @@ func (b *blockEnc) encode(org []byte, raw, rawAllLits bool) error {
|
||||||
if len(b.sequences) == 0 {
|
if len(b.sequences) == 0 {
|
||||||
return b.encodeLits(b.literals, rawAllLits)
|
return b.encodeLits(b.literals, rawAllLits)
|
||||||
}
|
}
|
||||||
|
if len(b.sequences) == 1 && len(org) > 0 && len(b.literals) <= 1 {
|
||||||
|
// Check common RLE cases.
|
||||||
|
seq := b.sequences[0]
|
||||||
|
if seq.litLen == uint32(len(b.literals)) && seq.offset-3 == 1 {
|
||||||
|
// Offset == 1 and 0 or 1 literals.
|
||||||
|
b.encodeRLE(org[0], b.sequences[0].matchLen+zstdMinMatch+seq.litLen)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// We want some difference to at least account for the headers.
|
// We want some difference to at least account for the headers.
|
||||||
saved := b.size - len(b.literals) - (b.size >> 6)
|
saved := b.size - len(b.literals) - (b.size >> 6)
|
||||||
if saved < 16 {
|
if saved < 16 {
|
||||||
|
|
|
@ -82,7 +82,7 @@ var (
|
||||||
// can run multiple concurrent stateless decodes. It is even possible to
|
// can run multiple concurrent stateless decodes. It is even possible to
|
||||||
// use stateless decodes while a stream is being decoded.
|
// use stateless decodes while a stream is being decoded.
|
||||||
//
|
//
|
||||||
// The Reset function can be used to initiate a new stream, which is will considerably
|
// The Reset function can be used to initiate a new stream, which will considerably
|
||||||
// reduce the allocations normally caused by NewReader.
|
// reduce the allocations normally caused by NewReader.
|
||||||
func NewReader(r io.Reader, opts ...DOption) (*Decoder, error) {
|
func NewReader(r io.Reader, opts ...DOption) (*Decoder, error) {
|
||||||
initPredefined()
|
initPredefined()
|
||||||
|
|
|
@ -135,8 +135,20 @@ func (e *bestFastEncoder) Encode(blk *blockEnc, src []byte) {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add block to history
|
||||||
s := e.addBlock(src)
|
s := e.addBlock(src)
|
||||||
blk.size = len(src)
|
blk.size = len(src)
|
||||||
|
|
||||||
|
// Check RLE first
|
||||||
|
if len(src) > zstdMinMatch {
|
||||||
|
ml := matchLen(src[1:], src)
|
||||||
|
if ml == len(src)-1 {
|
||||||
|
blk.literals = append(blk.literals, src[0])
|
||||||
|
blk.sequences = append(blk.sequences, seq{litLen: 1, matchLen: uint32(len(src)-1) - zstdMinMatch, offset: 1 + 3})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if len(src) < minNonLiteralBlockSize {
|
if len(src) < minNonLiteralBlockSize {
|
||||||
blk.extraLits = len(src)
|
blk.extraLits = len(src)
|
||||||
blk.literals = blk.literals[:len(src)]
|
blk.literals = blk.literals[:len(src)]
|
||||||
|
|
|
@ -102,9 +102,20 @@ func (e *betterFastEncoder) Encode(blk *blockEnc, src []byte) {
|
||||||
e.cur = e.maxMatchOff
|
e.cur = e.maxMatchOff
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
// Add block to history
|
||||||
s := e.addBlock(src)
|
s := e.addBlock(src)
|
||||||
blk.size = len(src)
|
blk.size = len(src)
|
||||||
|
|
||||||
|
// Check RLE first
|
||||||
|
if len(src) > zstdMinMatch {
|
||||||
|
ml := matchLen(src[1:], src)
|
||||||
|
if ml == len(src)-1 {
|
||||||
|
blk.literals = append(blk.literals, src[0])
|
||||||
|
blk.sequences = append(blk.sequences, seq{litLen: 1, matchLen: uint32(len(src)-1) - zstdMinMatch, offset: 1 + 3})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if len(src) < minNonLiteralBlockSize {
|
if len(src) < minNonLiteralBlockSize {
|
||||||
blk.extraLits = len(src)
|
blk.extraLits = len(src)
|
||||||
blk.literals = blk.literals[:len(src)]
|
blk.literals = blk.literals[:len(src)]
|
||||||
|
|
|
@ -14,7 +14,7 @@ github.com/inconshreveable/mousetrap
|
||||||
# github.com/julienschmidt/httprouter v1.3.0
|
# github.com/julienschmidt/httprouter v1.3.0
|
||||||
## explicit; go 1.7
|
## explicit; go 1.7
|
||||||
github.com/julienschmidt/httprouter
|
github.com/julienschmidt/httprouter
|
||||||
# github.com/klauspost/compress v1.17.7
|
# github.com/klauspost/compress v1.17.8
|
||||||
## explicit; go 1.20
|
## explicit; go 1.20
|
||||||
github.com/klauspost/compress
|
github.com/klauspost/compress
|
||||||
github.com/klauspost/compress/fse
|
github.com/klauspost/compress/fse
|
||||||
|
@ -39,7 +39,7 @@ golang.org/x/image/riff
|
||||||
golang.org/x/image/vp8
|
golang.org/x/image/vp8
|
||||||
golang.org/x/image/vp8l
|
golang.org/x/image/vp8l
|
||||||
golang.org/x/image/webp
|
golang.org/x/image/webp
|
||||||
# golang.org/x/net v0.22.0
|
# golang.org/x/net v0.24.0
|
||||||
## explicit; go 1.18
|
## explicit; go 1.18
|
||||||
golang.org/x/net/html
|
golang.org/x/net/html
|
||||||
golang.org/x/net/html/atom
|
golang.org/x/net/html/atom
|
||||||
|
|
Loading…
Reference in New Issue