mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
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
This commit is contained in:
parent
1eba218e44
commit
b0683bd77a
30 changed files with 87 additions and 68 deletions
|
|
@ -11,6 +11,7 @@ import (
|
|||
"flag";
|
||||
"fmt";
|
||||
"io";
|
||||
"io/ioutil";
|
||||
"os";
|
||||
"patch";
|
||||
"path";
|
||||
|
|
@ -35,9 +36,9 @@ func main() {
|
|||
var err os.Error;
|
||||
switch len(args) {
|
||||
case 0:
|
||||
data, err = io.ReadAll(os.Stdin)
|
||||
data, err = ioutil.ReadAll(os.Stdin)
|
||||
case 1:
|
||||
data, err = io.ReadFile(args[0])
|
||||
data, err = ioutil.ReadFile(args[0])
|
||||
default:
|
||||
usage()
|
||||
}
|
||||
|
|
@ -87,7 +88,7 @@ func main() {
|
|||
}
|
||||
|
||||
// Apply changes in memory.
|
||||
op, err := pset.Apply(io.ReadFile);
|
||||
op, err := pset.Apply(ioutil.ReadFile);
|
||||
chk(err);
|
||||
|
||||
// Write changes to disk copy: order of commands matters.
|
||||
|
|
@ -143,7 +144,7 @@ func main() {
|
|||
changed[o.Dst] = 1;
|
||||
}
|
||||
if o.Data != nil {
|
||||
chk(io.WriteFile(o.Dst, o.Data, 0644));
|
||||
chk(ioutil.WriteFile(o.Dst, o.Data, 0644));
|
||||
if o.Verb == patch.Add {
|
||||
undoRm(o.Dst)
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue