From 9599e35e75f3bf5223edd9b0a0854536c23cdef2 Mon Sep 17 00:00:00 2001 From: Rob Pike Date: Wed, 2 Dec 2009 22:02:14 -0800 Subject: move ReadFile, WriteFile, and ReadDir into a separate io/ioutil package. this breaks the dependency of package io on package bytes. R=rsc CC=golang-dev http://codereview.appspot.com/163085 --- src/cmd/cgo/util.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/cmd/cgo/util.go') diff --git a/src/cmd/cgo/util.go b/src/cmd/cgo/util.go index 53b3ef6a3..176e9528e 100644 --- a/src/cmd/cgo/util.go +++ b/src/cmd/cgo/util.go @@ -8,7 +8,7 @@ import ( "exec"; "fmt"; "go/token"; - "io"; + "io/ioutil"; "os"; ) @@ -57,11 +57,11 @@ func run(stdin []byte, argv []string) (stdout, stderr []byte, ok bool) { }(); var xstdout []byte; // TODO(rsc): delete after 6g can take address of out parameter go func() { - xstdout, _ = io.ReadAll(r1); + xstdout, _ = ioutil.ReadAll(r1); r1.Close(); c <- true; }(); - stderr, _ = io.ReadAll(r2); + stderr, _ = ioutil.ReadAll(r2); r2.Close(); <-c; <-c; -- cgit v1.2.3