cmd: remove bio.BufReader and bio.BufWriter

bio.BufReader was never used.

bio.BufWriter was used to wrap an existing io.Writer, but the
bio.Writer returned would not be seekable, so replace all occurences
with bufio.Reader instead.

Change-Id: I9c6779e35c63178aa4e104c17bb5bb8b52de0359
Reviewed-on: https://go-review.googlesource.com/21722
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Dave Cheney <dave@cheney.net>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/cmd/asm/internal/asm/endtoend_test.go b/src/cmd/asm/internal/asm/endtoend_test.go
index 8986281f1070cbccc9410766ab3937b61a12cf5c..bc992a7c991efa3cc3008c32b90bc176f6e667ef 100644 (file)
--- a/src/cmd/asm/internal/asm/endtoend_test.go
+++ b/src/cmd/asm/internal/asm/endtoend_test.go
@@ -5,6 +5,7 @@
 package asm
 
 import (
+       "bufio"
        "bytes"
        "fmt"
        "io/ioutil"
@@ -17,7 +18,6 @@ import (
        "testing"
 
        "cmd/asm/internal/lex"
-       "cmd/internal/bio"
        "cmd/internal/obj"
 )
 
@@ -34,7 +34,7 @@ func testEndToEnd(t *testing.T, goarch, file string) {
        pList := obj.Linknewplist(ctxt)
        var ok bool
        testOut = new(bytes.Buffer) // The assembler writes test output to this buffer.
-       ctxt.Bso = bio.BufWriter(os.Stdout)
+       ctxt.Bso = bufio.NewWriter(os.Stdout)
        defer ctxt.Bso.Flush()
        failed := false
        ctxt.DiagFunc = func(format string, args ...interface{}) {
@@ -272,7 +272,7 @@ func testErrors(t *testing.T, goarch, file string) {
        pList := obj.Linknewplist(ctxt)
        var ok bool
        testOut = new(bytes.Buffer) // The assembler writes test output to this buffer.
-       ctxt.Bso = bio.BufWriter(os.Stdout)
+       ctxt.Bso = bufio.NewWriter(os.Stdout)
        defer ctxt.Bso.Flush()
        failed := false
        var errBuf bytes.Buffer

diff --git a/src/cmd/asm/main.go b/src/cmd/asm/main.go
index 75cb8f75d3eed0241ea7cb93eaf88b8f6d43203f..f010ca93f171e664ffb5ab12394b41f1cfb86a8d 100644 (file)
--- a/src/cmd/asm/main.go
+++ b/src/cmd/asm/main.go
@@ -5,6 +5,7 @@
 package main
 
 import (
+       "bufio"
        "flag"
        "fmt"
        "log"
@@ -32,11 +33,6 @@ func main() {
 
        flags.Parse()
 
-       // Create object file, write header.
-       fd, err := os.Create(*flags.OutputFile)
-       if err != nil {
-               log.Fatal(err)
-       }
        ctxt := obj.Linknew(architecture.LinkArch)
        if *flags.PrintOut {
                ctxt.Debugasm = 1
@@ -46,9 +42,14 @@ func main() {
        if *flags.Shared || *flags.Dynlink {
                ctxt.Flag_shared = 1
        }
-       ctxt.Bso = bio.BufWriter(os.Stdout)
+       ctxt.Bso = bufio.NewWriter(os.Stdout)
        defer ctxt.Bso.Flush()
-       output := bio.BufWriter(fd)
+
+       // Create object file, write header.
+       output, err := bio.Create(*flags.OutputFile)
+       if err != nil {
+               log.Fatal(err)
+       }
        fmt.Fprintf(output, "go object %s %s %s\n", obj.Getgoos(), obj.Getgoarch(), obj.Getgoversion())
        fmt.Fprintf(output, "!\n")
 

diff --git a/src/cmd/compile/internal/gc/bexport.go b/src/cmd/compile/internal/gc/bexport.go
index bb0a34e67b6abaac877808a9975cd5bad932c4ae..15e5e3ada600be68fb06c53eb08c75bda109e698 100644 (file)
--- a/src/cmd/compile/internal/gc/bexport.go
+++ b/src/cmd/compile/internal/gc/bexport.go
@@ -90,9 +90,9 @@ importer.
 package gc
 
 import (
+       "bufio"
        "bytes"
        "cmd/compile/internal/big"
-       "cmd/internal/bio"
        "encoding/binary"
        "fmt"
        "sort"
@@ -124,7 +124,7 @@ const exportVersion = "v0"
 const exportInlined = true // default: true
 
 type exporter struct {
-       out      *bio.Writer
+       out      *bufio.Writer
        pkgIndex map[*Pkg]int
        typIndex map[*Type]int
        inlined  []*Func
@@ -136,7 +136,7 @@ type exporter struct {
 }
 
 // export writes the exportlist for localpkg to out and returns the number of bytes written.
-func export(out *bio.Writer, trace bool) int {
+func export(out *bufio.Writer, trace bool) int {
        p := exporter{
                out:      out,
                pkgIndex: make(map[*Pkg]int),

diff --git a/src/cmd/compile/internal/gc/export.go b/src/cmd/compile/internal/gc/export.go
index 2f94b9c62fc26b556875c82ba544be5397aac6f9..dc7c0869bfa7a5ba26c88b8bd571f609d4271b24 100644 (file)
--- a/src/cmd/compile/internal/gc/export.go
+++ b/src/cmd/compile/internal/gc/export.go
@@ -384,7 +384,7 @@ func dumpexport() {
                if debugFormat {
                        // save a copy of the export data
                        var copy bytes.Buffer
-                       bcopy := bio.BufWriter(&copy)
+                       bcopy := bufio.NewWriter(&copy)
                        size = export(bcopy, Debug_export != 0)
                        bcopy.Flush() // flushing to bytes.Buffer cannot fail
                        if n, err := bout.Write(copy.Bytes()); n != size || err != nil {
@@ -407,7 +407,7 @@ func dumpexport() {
                        pkgs = savedPkgs
                        pkgMap = savedPkgMap
                } else {
-                       size = export(bout, Debug_export != 0)
+                       size = export(bout.Writer(), Debug_export != 0)
                }
                exportf("\n$$\n")
        } else {

diff --git a/src/cmd/compile/internal/gc/go.go b/src/cmd/compile/internal/gc/go.go
index ec7e219d9546c822bd5fb89bf8a60dae1e975675..d9b28ff8e65a24f8f1b1c34805b2e68f14952da6 100644 (file)
--- a/src/cmd/compile/internal/gc/go.go
+++ b/src/cmd/compile/internal/gc/go.go
@@ -5,6 +5,7 @@
 package gc
 
 import (
+       "bufio"
        "cmd/compile/internal/ssa"
        "cmd/internal/bio"
        "cmd/internal/obj"
@@ -288,7 +289,7 @@ var Ctxt *obj.Link
 
 var writearchive int
 
-var bstdout *bio.Writer
+var bstdout *bufio.Writer
 
 var Nacl bool
 

diff --git a/src/cmd/compile/internal/gc/main.go b/src/cmd/compile/internal/gc/main.go
index 03143f5d0a793fff92a9d4b0c1cf928860868d07..26acf8861fbe335c56886c4eec9c3e0f568a891e 100644 (file)
--- a/src/cmd/compile/internal/gc/main.go
+++ b/src/cmd/compile/internal/gc/main.go
@@ -9,7 +9,6 @@ package gc
 import (
        "bufio"
        "cmd/compile/internal/ssa"
-       "cmd/internal/bio"
        "cmd/internal/obj"
        "cmd/internal/sys"
        "flag"
@@ -104,7 +103,7 @@ func Main() {
 
        Ctxt = obj.Linknew(Thearch.LinkArch)
        Ctxt.DiagFunc = Yyerror
-       bstdout = bio.BufWriter(os.Stdout)
+       bstdout = bufio.NewWriter(os.Stdout)
        Ctxt.Bso = bstdout
 
        localpkg = mkpkg("")

diff --git a/src/cmd/internal/bio/buf.go b/src/cmd/internal/bio/buf.go
index 0bd4658cdd42422db2609d37b33022d26f15bd62..983ce4662719464453ff0561c840800733e80646 100644 (file)
--- a/src/cmd/internal/bio/buf.go
+++ b/src/cmd/internal/bio/buf.go
@@ -51,18 +51,6 @@ func Open(name string) (*Reader, error) {
        return &Reader{f: f, r: bufio.NewReader(f)}, nil
 }
 
-// BufWriter returns a Writer on top of w.
-// TODO(dfc) remove this method and replace caller with bufio.Writer.
-func BufWriter(w io.Writer) *Writer {
-       return &Writer{w: bufio.NewWriter(w)}
-}
-
-// BufWriter returns a Reader on top of r.
-// TODO(dfc) remove this method and replace caller with bufio.Reader.
-func BufReader(r io.Reader) *Reader {
-       return &Reader{r: bufio.NewReader(r)}
-}
-
 func (w *Writer) Write(p []byte) (int, error) {
        return w.w.Write(p)
 }

diff --git a/src/cmd/internal/obj/link.go b/src/cmd/internal/obj/link.go
index c48c3d807fe90961538e2c5a7c601396f4f06d7a..62175f9ed8541781376e37ea61c1f52a0ed47ba1 100644 (file)
--- a/src/cmd/internal/obj/link.go
+++ b/src/cmd/internal/obj/link.go
@@ -31,7 +31,7 @@
 package obj
 
 import (
-       "cmd/internal/bio"
+       "bufio"
        "cmd/internal/sys"
 )
 
@@ -629,7 +629,7 @@ type Link struct {
        Flag_shared   int32
        Flag_dynlink  bool
        Flag_optimize bool
-       Bso           *bio.Writer
+       Bso           *bufio.Writer
        Pathname      string
        Goroot        string
        Goroot_final  string

diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
index e35306dd0e6b8dced1f49907c07a3544a96ee86b..01dca9fc31e41070e5b6c2f110dff1068508b516 100644 (file)
--- a/src/cmd/link/internal/ld/lib.go
+++ b/src/cmd/link/internal/ld/lib.go
@@ -241,7 +241,7 @@ const (
 var (
        headstring string
        // buffered output
-       Bso *bio.Writer
+       Bso *bufio.Writer
 )
 
 // TODO(dfc) outBuf duplicates bio.Writer

diff --git a/src/cmd/link/internal/ld/link.go b/src/cmd/link/internal/ld/link.go
index cbcc979c85641a1cef225598be26a0949c02c8c6..52b52f1cc009b8cb94e57f1b158fc647eae84a85 100644 (file)
--- a/src/cmd/link/internal/ld/link.go
+++ b/src/cmd/link/internal/ld/link.go
@@ -31,7 +31,7 @@
 package ld
 
 import (
-       "cmd/internal/bio"
+       "bufio"
        "cmd/internal/sys"
        "debug/elf"
        "fmt"
@@ -165,10 +165,9 @@ type Link struct {
        Headtype  int
        Arch      *sys.Arch
        Debugvlog int32
-
-       Bso     *bio.Writer
-       Windows int32
-       Goroot  string
+       Bso       *bufio.Writer
+       Windows   int32
+       Goroot    string
 
        // Symbol lookup based on name and indexed by version.
        Hash []map[string]*LSym

diff --git a/src/cmd/link/internal/ld/pobj.go b/src/cmd/link/internal/ld/pobj.go
index 50066d32d7b5ffcca43cb98b8b0cce3f4483efda..f4fb4d484563477c2a41367bd8c9f7cd1e4ca979 100644 (file)
--- a/src/cmd/link/internal/ld/pobj.go
+++ b/src/cmd/link/internal/ld/pobj.go
@@ -31,7 +31,7 @@
 package ld
 
 import (
-       "cmd/internal/bio"
+       "bufio"
        "cmd/internal/obj"
        "cmd/internal/sys"
        "flag"
@@ -46,7 +46,7 @@ var (
 )
 
 func Ldmain() {
-       Bso = bio.BufWriter(os.Stdout)
+       Bso = bufio.NewWriter(os.Stdout)
 
        Ctxt = linknew(SysArch)
        Ctxt.Diag = Diag