Name change to improve embeddability:
io.Read->io.Reader
io.Write,Close,etc.->io.Writer,Closer etc.
R=rsc
DELTA=190 (0 added, 0 deleted, 190 changed)
OCL=28525
CL=28535
diff --git a/src/lib/bufio/bufio_test.go b/src/lib/bufio/bufio_test.go
index 00ab4a4..4b00cae 100644
--- a/src/lib/bufio/bufio_test.go
+++ b/src/lib/bufio/bufio_test.go
@@ -24,7 +24,7 @@
p []byte
}
-func newByteReader(p []byte) io.Read {
+func newByteReader(p []byte) io.Reader {
b := new(byteReader);
b.p = p;
return b
@@ -46,7 +46,7 @@
p []byte
}
-func newHalfByteReader(p []byte) io.Read {
+func newHalfByteReader(p []byte) io.Reader {
b := new(halfByteReader);
b.p = p;
return b
@@ -67,10 +67,10 @@
// Reads from a reader and rot13s the result.
type rot13Reader struct {
- r io.Read
+ r io.Reader
}
-func newRot13Reader(r io.Read) *rot13Reader {
+func newRot13Reader(r io.Reader) *rot13Reader {
r13 := new(rot13Reader);
r13.r = r;
return r13
@@ -95,11 +95,11 @@
type readMaker struct {
name string;
- fn func([]byte) io.Read;
+ fn func([]byte) io.Reader;
}
var readMakers = []readMaker {
- readMaker{ "full", func(p []byte) io.Read { return newByteReader(p) } },
- readMaker{ "half", func(p []byte) io.Read { return newHalfByteReader(p) } },
+ readMaker{ "full", func(p []byte) io.Reader { return newByteReader(p) } },
+ readMaker{ "half", func(p []byte) io.Reader { return newHalfByteReader(p) } },
}
// Call ReadLineString (which ends up calling everything else)
