diff options
| author | Rob Pike <r@golang.org> | 2009-12-02 22:02:14 -0800 |
|---|---|---|
| committer | Rob Pike <r@golang.org> | 2009-12-02 22:02:14 -0800 |
| commit | b0683bd77a0779fd9a87a2a51bd9eb7969606ffe (patch) | |
| tree | 001feca95c4e2cafe620e288df557b3eb21c9079 /src/pkg/encoding | |
| parent | 1eba218e4448a94d4319e73148d5c478a1e6685f (diff) | |
| download | go-b0683bd77a0779fd9a87a2a51bd9eb7969606ffe.tar.xz | |
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
https://golang.org/cl/163085
Diffstat (limited to 'src/pkg/encoding')
| -rw-r--r-- | src/pkg/encoding/ascii85/ascii85_test.go | 6 | ||||
| -rw-r--r-- | src/pkg/encoding/base64/base64_test.go | 6 | ||||
| -rw-r--r-- | src/pkg/encoding/git85/git_test.go | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/pkg/encoding/ascii85/ascii85_test.go b/src/pkg/encoding/ascii85/ascii85_test.go index 40bb1a25e8..294f638255 100644 --- a/src/pkg/encoding/ascii85/ascii85_test.go +++ b/src/pkg/encoding/ascii85/ascii85_test.go @@ -6,7 +6,7 @@ package ascii85 import ( "bytes"; - "io"; + "io/ioutil"; "os"; "reflect"; "strings"; @@ -111,7 +111,7 @@ func TestDecode(t *testing.T) { func TestDecoder(t *testing.T) { for _, p := range pairs { decoder := NewDecoder(bytes.NewBufferString(p.encoded)); - dbuf, err := io.ReadAll(decoder); + dbuf, err := ioutil.ReadAll(decoder); if err != nil { t.Fatal("Read failed", err) } @@ -176,7 +176,7 @@ func TestBig(t *testing.T) { if err != nil { t.Fatalf("Encoder.Close() = %v want nil", err) } - decoded, err := io.ReadAll(NewDecoder(encoded)); + decoded, err := ioutil.ReadAll(NewDecoder(encoded)); if err != nil { t.Fatalf("io.ReadAll(NewDecoder(...)): %v", err) } diff --git a/src/pkg/encoding/base64/base64_test.go b/src/pkg/encoding/base64/base64_test.go index 51e40ed7e5..3153a73470 100644 --- a/src/pkg/encoding/base64/base64_test.go +++ b/src/pkg/encoding/base64/base64_test.go @@ -6,7 +6,7 @@ package base64 import ( "bytes"; - "io"; + "io/ioutil"; "os"; "reflect"; "strings"; @@ -184,9 +184,9 @@ func TestBig(t *testing.T) { if err != nil { t.Fatalf("Encoder.Close() = %v want nil", err) } - decoded, err := io.ReadAll(NewDecoder(StdEncoding, encoded)); + decoded, err := ioutil.ReadAll(NewDecoder(StdEncoding, encoded)); if err != nil { - t.Fatalf("io.ReadAll(NewDecoder(...)): %v", err) + t.Fatalf("ioutil.ReadAll(NewDecoder(...)): %v", err) } if !bytes.Equal(raw, decoded) { diff --git a/src/pkg/encoding/git85/git_test.go b/src/pkg/encoding/git85/git_test.go index 713524af28..07367ddec6 100644 --- a/src/pkg/encoding/git85/git_test.go +++ b/src/pkg/encoding/git85/git_test.go @@ -6,7 +6,7 @@ package git85 import ( "bytes"; - "io"; + "io/ioutil"; "os"; "reflect"; "strings"; @@ -117,7 +117,7 @@ func TestDecode(t *testing.T) { func TestDecoder(t *testing.T) { for _, p := range gitPairs { decoder := NewDecoder(bytes.NewBufferString(p.encoded)); - dbuf, err := io.ReadAll(decoder); + dbuf, err := ioutil.ReadAll(decoder); if err != nil { t.Fatal("Read failed", err) } @@ -182,9 +182,9 @@ func TestGitBig(t *testing.T) { if err != nil { t.Fatalf("Encoder.Close() = %v want nil", err) } - decoded, err := io.ReadAll(NewDecoder(encoded)); + decoded, err := ioutil.ReadAll(NewDecoder(encoded)); if err != nil { - t.Fatalf("io.ReadAll(NewDecoder(...)): %v", err) + t.Fatalf("ioutil.ReadAll(NewDecoder(...)): %v", err) } if !bytes.Equal(raw, decoded) { |