Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit795e854

Browse files
cuishuanggopherbot
authored andcommitted
all: replace io/ioutil with io and os package
Forgolang/go#45557Change-Id: Ibf78d87cc94baa0d1696e5abc2edad3d2723e42bGitHub-Last-Rev:ad314caGitHub-Pull-Request:#34Reviewed-on:https://go-review.googlesource.com/c/text/+/430815Reviewed-by: Cherry Mui <cherryyz@google.com>TryBot-Result: Gopher Robot <gobot@golang.org>Reviewed-by: Ian Lance Taylor <iant@google.com>Reviewed-by: Meng Zhuo <mzh@golangcn.org>Run-TryBot: Ian Lance Taylor <iant@google.com>Run-TryBot: Meng Zhuo <mzh@golangcn.org>Auto-Submit: Ian Lance Taylor <iant@google.com>
1 parentb0ca10f commit795e854

File tree

21 files changed

+56
-69
lines changed

21 files changed

+56
-69
lines changed

‎cases/gen.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"bytes"
1717
"fmt"
1818
"io"
19-
"io/ioutil"
2019
"log"
2120
"reflect"
2221
"strconv"
@@ -635,9 +634,9 @@ func genTablesTest() {
635634

636635
// We discard the output as we know we have perfect functions. We run them
637636
// just to verify the properties are correct.
638-
n:=printProperties(ioutil.Discard,"DerivedCoreProperties.txt","Cased",verifyCased)
639-
n+=printProperties(ioutil.Discard,"DerivedCoreProperties.txt","Lowercase",verifyLower)
640-
n+=printProperties(ioutil.Discard,"DerivedCoreProperties.txt","Uppercase",verifyUpper)
637+
n:=printProperties(io.Discard,"DerivedCoreProperties.txt","Cased",verifyCased)
638+
n+=printProperties(io.Discard,"DerivedCoreProperties.txt","Lowercase",verifyLower)
639+
n+=printProperties(io.Discard,"DerivedCoreProperties.txt","Uppercase",verifyUpper)
641640
ifn>0 {
642641
log.Fatalf("One of the discarded properties does not have a perfect filter.")
643642
}

‎cmd/gotext/main.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"go/build"
1717
"go/format"
1818
"io"
19-
"io/ioutil"
2019
"log"
2120
"os"
2221
"strings"
@@ -310,7 +309,7 @@ func help(args []string) {
310309
iferr!=nil {
311310
logf("Could not format generated docs: %v\n",err)
312311
}
313-
iferr:=ioutil.WriteFile("doc.go",b,0666);err!=nil {
312+
iferr:=os.WriteFile("doc.go",b,0666);err!=nil {
314313
logf("Could not create file alldocs.go: %v\n",err)
315314
}
316315
}else {

‎collate/maketables.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"flag"
1818
"fmt"
1919
"io"
20-
"io/ioutil"
2120
"log"
2221
"os"
2322
"regexp"
@@ -187,7 +186,7 @@ func failOnError(e error) {
187186

188187
funcopenArchive()*zip.Reader {
189188
f:=gen.OpenCLDRCoreZip()
190-
buffer,err:=ioutil.ReadAll(f)
189+
buffer,err:=io.ReadAll(f)
191190
f.Close()
192191
failOnError(err)
193192
archive,err:=zip.NewReader(bytes.NewReader(buffer),int64(len(buffer)))

‎collate/reg_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"bytes"
1111
"flag"
1212
"io"
13-
"io/ioutil"
1413
"log"
1514
"path"
1615
"regexp"
@@ -133,7 +132,7 @@ func convHex(line int, s string) int {
133132

134133
funcloadTestData() []Test {
135134
f:=gen.OpenUnicodeFile("UCA","","CollationTest.zip")
136-
buffer,err:=ioutil.ReadAll(f)
135+
buffer,err:=io.ReadAll(f)
137136
f.Close()
138137
Error(err)
139138
archive,err:=zip.NewReader(bytes.NewReader(buffer),int64(len(buffer)))

‎encoding/encoding_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package encoding_test
66

77
import (
8-
"io/ioutil"
8+
"io"
99
"strings"
1010
"testing"
1111

@@ -62,7 +62,7 @@ func TestReplacement(t *testing.T) {
6262
want="AB\x00CD\ufffdYZ"
6363
}
6464
sr:=strings.NewReader("AB\x00CD\x80YZ")
65-
g,err:=ioutil.ReadAll(transform.NewReader(sr,enc))
65+
g,err:=io.ReadAll(transform.NewReader(sr,enc))
6666
iferr!=nil {
6767
t.Errorf("%s: ReadAll: %v",direction,err)
6868
continue

‎encoding/internal/enctest/enctest.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"bytes"
99
"fmt"
1010
"io"
11-
"io/ioutil"
11+
"os"
1212
"strings"
1313
"testing"
1414

@@ -105,7 +105,7 @@ func Benchmark(b *testing.B, enc encoding.Encoding) {
105105
b.ResetTimer()
106106
fori:=0;i<b.N;i++ {
107107
r:=transform.NewReader(bytes.NewReader(src),transformer)
108-
io.Copy(ioutil.Discard,r)
108+
io.Copy(io.Discard,r)
109109
}
110110
})
111111
}
@@ -157,15 +157,15 @@ func load(direction string, enc encoding.Encoding) ([]byte, []byte, Transcoder,
157157
dstFile,srcFile=srcFile,dstFile
158158
coder=enc.NewDecoder()
159159
}
160-
dst,err:=ioutil.ReadFile(dstFile)
160+
dst,err:=os.ReadFile(dstFile)
161161
iferr!=nil {
162-
ifdst,err=ioutil.ReadFile("../"+dstFile);err!=nil {
162+
ifdst,err=os.ReadFile("../"+dstFile);err!=nil {
163163
returnnil,nil,nil,err
164164
}
165165
}
166-
src,err:=ioutil.ReadFile(srcFile)
166+
src,err:=os.ReadFile(srcFile)
167167
iferr!=nil {
168-
ifsrc,err=ioutil.ReadFile("../"+srcFile);err!=nil {
168+
ifsrc,err=os.ReadFile("../"+srcFile);err!=nil {
169169
returnnil,nil,nil,err
170170
}
171171
}

‎encoding/traditionalchinese/all_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package traditionalchinese
66

77
import (
88
"fmt"
9-
"io/ioutil"
9+
"io"
1010
"strings"
1111
"testing"
1212

@@ -103,7 +103,7 @@ func TestBig5CircumflexAndMacron(t *testing.T) {
103103
"\x88\xa2\x88\xa3\x88\xa4\x88\xa5\x88\xa6"
104104
want:="ÓǑÒ\u00ca\u0304Ế\u00ca\u030cỀÊ "+
105105
"ü\u00ea\u0304ế\u00ea\u030cề"
106-
dst,err:=ioutil.ReadAll(transform.NewReader(
106+
dst,err:=io.ReadAll(transform.NewReader(
107107
strings.NewReader(src),Big5.NewDecoder()))
108108
iferr!=nil {
109109
t.Fatal(err)

‎feature/plural/message.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package plural
66

77
import (
88
"fmt"
9-
"io/ioutil"
9+
"io"
1010
"reflect"
1111
"strconv"
1212

@@ -56,7 +56,7 @@ type Interface interface {
5656
funcSelectf(argint,formatstring,cases...interface{}) catalog.Message {
5757
varpparser
5858
// Intercept the formatting parameters of format by doing a dummy print.
59-
fmt.Fprintf(ioutil.Discard,format,&p)
59+
fmt.Fprintf(io.Discard,format,&p)
6060
m:=&message{arg,kindDefault,0,cases}
6161
switchp.verb {
6262
case'g':

‎gen.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"flag"
1515
"fmt"
1616
"go/format"
17-
"io/ioutil"
1817
"os"
1918
"os/exec"
2019
"path"
@@ -256,7 +255,7 @@ func copyPackage(dirSrc, dirDst, search, replace string) {
256255
filepath.Dir(file)!=dirSrc {
257256
returnnil
258257
}
259-
b,err:=ioutil.ReadFile(file)
258+
b,err:=os.ReadFile(file)
260259
iferr!=nil||bytes.Contains(b, []byte("\n// +build ignore")) {
261260
returnerr
262261
}
@@ -275,7 +274,7 @@ func copyPackage(dirSrc, dirDst, search, replace string) {
275274
}
276275
file=filepath.Join(dirDst,base)
277276
vprintf("=== COPY %s\n",file)
278-
returnioutil.WriteFile(file,b,0666)
277+
returnos.WriteFile(file,b,0666)
279278
})
280279
iferr!=nil {
281280
fmt.Println("Copying exported files failed:",err)

‎internal/cldrtree/cldrtree_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ package cldrtree
77
import (
88
"bytes"
99
"flag"
10-
"io/ioutil"
1110
"log"
1211
"math/rand"
12+
"os"
1313
"path/filepath"
1414
"reflect"
1515
"regexp"
@@ -303,11 +303,11 @@ func TestGen(t *testing.T) {
303303

304304
file:=filepath.Join("testdata",tc,"output.go")
305305
if*genOutput {
306-
ioutil.WriteFile(file,got,0700)
306+
os.WriteFile(file,got,0700)
307307
t.SkipNow()
308308
}
309309

310-
b,err:=ioutil.ReadFile(file)
310+
b,err:=os.ReadFile(file)
311311
iferr!=nil {
312312
t.Fatalf("failed to open file: %v",err)
313313
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp