aboutsummaryrefslogtreecommitdiff
path: root/src/io
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2020-10-15 23:32:51 -0400
committerRuss Cox <rsc@golang.org>2020-10-16 17:52:59 +0000
commit03f181a90ef4de680a666ca86c7988915e892e8c (patch)
tree6eb4522469e0321b7ac989baac926663fc74fd09 /src/io
parent83317d9e3cb0674f71d1118d8814aefb31ac1239 (diff)
downloadgo-03f181a90ef4de680a666ca86c7988915e892e8c.tar.gz
go-03f181a90ef4de680a666ca86c7988915e892e8c.zip
io: unexport ErrBadWriteCount
It was added in CL 240740 to fix #39978 but without any discussion of the exported API. The error can still be returned to fix the issue, without adding new public API to package io. Also fix the error message to refer to lower-case write like the other errors in the package. Change-Id: I134de5eaf3ac903d73913c5cadcde904c5255d79 Reviewed-on: https://go-review.googlesource.com/c/go/+/262877 Trust: Russ Cox <rsc@golang.org> Run-TryBot: Russ Cox <rsc@golang.org> Reviewed-by: Emmanuel Odeke <emm.odeke@gmail.com> TryBot-Result: Go Bot <gobot@golang.org>
Diffstat (limited to 'src/io')
-rw-r--r--src/io/export_test.go8
-rw-r--r--src/io/io.go8
-rw-r--r--src/io/io_test.go2
3 files changed, 13 insertions, 5 deletions
diff --git a/src/io/export_test.go b/src/io/export_test.go
new file mode 100644
index 0000000000..fa3e8e76f6
--- /dev/null
+++ b/src/io/export_test.go
@@ -0,0 +1,8 @@
+// Copyright 2020 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package io
+
+// exported for test
+var ErrInvalidWrite = errInvalidWrite
diff --git a/src/io/io.go b/src/io/io.go
index 4bd1ae913a..a34c39a32a 100644
--- a/src/io/io.go
+++ b/src/io/io.go
@@ -27,12 +27,12 @@ const (
// but failed to return an explicit error.
var ErrShortWrite = errors.New("short write")
+// errInvalidWrite means that a write returned an impossible count.
+var errInvalidWrite = errors.New("invalid write result")
+
// ErrShortBuffer means that a read required a longer buffer than was provided.
var ErrShortBuffer = errors.New("short buffer")
-// ErrBadWriteCount means that a write returned an impossible count.
-var ErrBadWriteCount = errors.New("Write returned impossible count")
-
// EOF is the error returned by Read when no more input is available.
// (Read must return EOF itself, not an error wrapping EOF,
// because callers will test for EOF using ==.)
@@ -425,7 +425,7 @@ func copyBuffer(dst Writer, src Reader, buf []byte) (written int64, err error) {
if nw < 0 || nr < nw {
nw = 0
if ew == nil {
- ew = ErrBadWriteCount
+ ew = errInvalidWrite
}
}
written += int64(nw)
diff --git a/src/io/io_test.go b/src/io/io_test.go
index a8399bcac6..5b355e8c55 100644
--- a/src/io/io_test.go
+++ b/src/io/io_test.go
@@ -441,7 +441,7 @@ func (w largeWriter) Write(p []byte) (int, error) {
}
func TestCopyLargeWriter(t *testing.T) {
- want := ErrBadWriteCount
+ want := ErrInvalidWrite
rb := new(Buffer)
wb := largeWriter{}
rb.WriteString("hello, world.")