mirror of
https://github.com/golang/go
synced 2024-11-25 02:07:58 -07:00
flate: delete WrongValueError type.
Fixes #2838. R=rsc, r CC=golang-dev https://golang.org/cl/5651060
This commit is contained in:
parent
0846e275a8
commit
22636be8b0
13
doc/go1.html
13
doc/go1.html
@ -881,10 +881,15 @@ What little code is affected will be caught by the compiler and must be updated
|
|||||||
<h3 id="bufio">The compress/flate, compress/gzip and compress/zlib packages</h3>
|
<h3 id="bufio">The compress/flate, compress/gzip and compress/zlib packages</h3>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
In Go 1, the NewWriterXxx functions in compress/flate, compress/gzip and
|
In Go 1, the <code>NewWriterXxx</code> functions in
|
||||||
compress/zlib all return (*Writer, error) if they take a compression level,
|
<a href="/pkg/compress/flate"><code>compress/flate</code></a>,
|
||||||
and *Writer otherwise. Package gzip's Compressor and Decompressor types have
|
<a href="/pkg/compress/gzip"><code>compress/gzip</code></a> and
|
||||||
been renamed to Writer and Reader.
|
<a href="/pkg/compress/zlib"><code>compress/zlib</code></a>
|
||||||
|
all return <code>(*Writer, error)</code> if they take a compression level,
|
||||||
|
and <code>*Writer</code> otherwise. Package <code>gzip</code>'s
|
||||||
|
<code>Compressor</code> and <code>Decompressor</code> types have been renamed
|
||||||
|
to <code>Writer</code> and <code>Reader</code>. Package <code>flate</code>'s
|
||||||
|
<code>WrongValueError</code> type has been removed.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
|
13
doc/go1.tmpl
13
doc/go1.tmpl
@ -785,10 +785,15 @@ What little code is affected will be caught by the compiler and must be updated
|
|||||||
<h3 id="bufio">The compress/flate, compress/gzip and compress/zlib packages</h3>
|
<h3 id="bufio">The compress/flate, compress/gzip and compress/zlib packages</h3>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
In Go 1, the NewWriterXxx functions in compress/flate, compress/gzip and
|
In Go 1, the <code>NewWriterXxx</code> functions in
|
||||||
compress/zlib all return (*Writer, error) if they take a compression level,
|
<a href="/pkg/compress/flate"><code>compress/flate</code></a>,
|
||||||
and *Writer otherwise. Package gzip's Compressor and Decompressor types have
|
<a href="/pkg/compress/gzip"><code>compress/gzip</code></a> and
|
||||||
been renamed to Writer and Reader.
|
<a href="/pkg/compress/zlib"><code>compress/zlib</code></a>
|
||||||
|
all return <code>(*Writer, error)</code> if they take a compression level,
|
||||||
|
and <code>*Writer</code> otherwise. Package <code>gzip</code>'s
|
||||||
|
<code>Compressor</code> and <code>Decompressor</code> types have been renamed
|
||||||
|
to <code>Writer</code> and <code>Reader</code>. Package <code>flate</code>'s
|
||||||
|
<code>WrongValueError</code> type has been removed.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
package flate
|
package flate
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"math"
|
"math"
|
||||||
)
|
)
|
||||||
@ -390,7 +391,7 @@ func (d *compressor) init(w io.Writer, level int) (err error) {
|
|||||||
d.fill = (*compressor).fillDeflate
|
d.fill = (*compressor).fillDeflate
|
||||||
d.step = (*compressor).deflate
|
d.step = (*compressor).deflate
|
||||||
default:
|
default:
|
||||||
return WrongValueError{"level", 0, 9, int32(level)}
|
return fmt.Errorf("flate: invalid compression level %d: want value in range [-1, 9]", level)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,6 @@ package flate
|
|||||||
import (
|
import (
|
||||||
"io"
|
"io"
|
||||||
"math"
|
"math"
|
||||||
"strconv"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -85,13 +84,6 @@ type huffmanBitWriter struct {
|
|||||||
err error
|
err error
|
||||||
}
|
}
|
||||||
|
|
||||||
type WrongValueError struct {
|
|
||||||
name string
|
|
||||||
from int32
|
|
||||||
to int32
|
|
||||||
value int32
|
|
||||||
}
|
|
||||||
|
|
||||||
func newHuffmanBitWriter(w io.Writer) *huffmanBitWriter {
|
func newHuffmanBitWriter(w io.Writer) *huffmanBitWriter {
|
||||||
return &huffmanBitWriter{
|
return &huffmanBitWriter{
|
||||||
w: w,
|
w: w,
|
||||||
@ -105,11 +97,6 @@ func newHuffmanBitWriter(w io.Writer) *huffmanBitWriter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (err WrongValueError) Error() string {
|
|
||||||
return "huffmanBitWriter: " + err.name + " should belong to [" + strconv.FormatInt(int64(err.from), 10) + ";" +
|
|
||||||
strconv.FormatInt(int64(err.to), 10) + "] but actual value is " + strconv.FormatInt(int64(err.value), 10)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (w *huffmanBitWriter) flushBits() {
|
func (w *huffmanBitWriter) flushBits() {
|
||||||
if w.err != nil {
|
if w.err != nil {
|
||||||
w.nbits = 0
|
w.nbits = 0
|
||||||
|
Loading…
Reference in New Issue
Block a user