Skip to content

Commit 1bfa8e3

Browse files
committed
gopls: update uses of deprecated ioutil APIs
Change-Id: I35acdc8a1e8e558f905fd6879b3ac8332e7c2325 Reviewed-on: https://go-review.googlesource.com/c/tools/+/524836 Reviewed-by: Alan Donovan <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: qiulaidongfeng <[email protected]> Run-TryBot: Robert Findley <[email protected]>
1 parent 914b218 commit 1bfa8e3

File tree

6 files changed

+10
-19
lines changed

6 files changed

+10
-19
lines changed

gopls/internal/lsp/cache/mod_tidy.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"fmt"
1010
"go/ast"
1111
"go/token"
12-
"io/ioutil"
1312
"os"
1413
"path/filepath"
1514
"strconv"
@@ -118,7 +117,7 @@ func modTidyImpl(ctx context.Context, snapshot *snapshot, filename string, pm *s
118117

119118
// Go directly to disk to get the temporary mod file,
120119
// since it is always on disk.
121-
tempContents, err := ioutil.ReadFile(tmpURI.Filename())
120+
tempContents, err := os.ReadFile(tmpURI.Filename())
122121
if err != nil {
123122
return nil, err
124123
}

gopls/internal/lsp/cache/snapshot.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"go/token"
1515
"go/types"
1616
"io"
17-
"io/ioutil"
1817
"log"
1918
"os"
2019
"path/filepath"
@@ -456,11 +455,11 @@ func (s *snapshot) RunGoCommands(ctx context.Context, allowNetwork bool, wd stri
456455
return false, nil, nil, nil
457456
}
458457
var modBytes, sumBytes []byte
459-
modBytes, err = ioutil.ReadFile(tmpURI.Filename())
458+
modBytes, err = os.ReadFile(tmpURI.Filename())
460459
if err != nil && !os.IsNotExist(err) {
461460
return false, nil, nil, err
462461
}
463-
sumBytes, err = ioutil.ReadFile(strings.TrimSuffix(tmpURI.Filename(), ".mod") + ".sum")
462+
sumBytes, err = os.ReadFile(strings.TrimSuffix(tmpURI.Filename(), ".mod") + ".sum")
464463
if err != nil && !os.IsNotExist(err) {
465464
return false, nil, nil, err
466465
}

gopls/internal/lsp/cache/view.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"encoding/json"
1212
"errors"
1313
"fmt"
14-
"io/ioutil"
1514
"os"
1615
"path"
1716
"path/filepath"
@@ -351,7 +350,7 @@ func (v *View) ID() string { return v.id }
351350
// longer needed.
352351
func tempModFile(modFh source.FileHandle, gosum []byte) (tmpURI span.URI, cleanup func(), err error) {
353352
filenameHash := source.Hashf("%s", modFh.URI().Filename())
354-
tmpMod, err := ioutil.TempFile("", fmt.Sprintf("go.%s.*.mod", filenameHash))
353+
tmpMod, err := os.CreateTemp("", fmt.Sprintf("go.%s.*.mod", filenameHash))
355354
if err != nil {
356355
return "", nil, err
357356
}
@@ -386,7 +385,7 @@ func tempModFile(modFh source.FileHandle, gosum []byte) (tmpURI span.URI, cleanu
386385

387386
// Create an analogous go.sum, if one exists.
388387
if gosum != nil {
389-
if err := ioutil.WriteFile(tmpSumName, gosum, 0655); err != nil {
388+
if err := os.WriteFile(tmpSumName, gosum, 0655); err != nil {
390389
return "", nil, err
391390
}
392391
}

gopls/internal/lsp/cache/view_test.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package cache
66
import (
77
"context"
88
"encoding/json"
9-
"io/ioutil"
109
"os"
1110
"path/filepath"
1211
"testing"
@@ -20,17 +19,14 @@ import (
2019
)
2120

2221
func TestCaseInsensitiveFilesystem(t *testing.T) {
23-
base, err := ioutil.TempDir("", t.Name())
24-
if err != nil {
25-
t.Fatal(err)
26-
}
22+
base := t.TempDir()
2723

2824
inner := filepath.Join(base, "a/B/c/DEFgh")
2925
if err := os.MkdirAll(inner, 0777); err != nil {
3026
t.Fatal(err)
3127
}
3228
file := filepath.Join(inner, "f.go")
33-
if err := ioutil.WriteFile(file, []byte("hi"), 0777); err != nil {
29+
if err := os.WriteFile(file, []byte("hi"), 0777); err != nil {
3430
t.Fatal(err)
3531
}
3632
if _, err := os.Stat(filepath.Join(inner, "F.go")); err != nil {

gopls/internal/lsp/command.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"errors"
1212
"fmt"
1313
"io"
14-
"io/ioutil"
1514
"os"
1615
"os/exec"
1716
"path/filepath"
@@ -629,7 +628,7 @@ func collectFileEdits(ctx context.Context, snapshot source.Snapshot, uri span.UR
629628
// file and leave it unsaved. We would rather apply the changes directly,
630629
// especially to go.sum, which should be mostly invisible to the user.
631630
if !snapshot.IsOpen(uri) {
632-
err := ioutil.WriteFile(uri.Filename(), newContent, 0666)
631+
err := os.WriteFile(uri.Filename(), newContent, 0666)
633632
return nil, err
634633
}
635634

gopls/internal/lsp/source/gc_annotations.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"context"
1010
"encoding/json"
1111
"fmt"
12-
"io/ioutil"
1312
"os"
1413
"path/filepath"
1514
"strings"
@@ -45,7 +44,7 @@ func GCOptimizationDetails(ctx context.Context, snapshot Snapshot, m *Metadata)
4544
if err := os.MkdirAll(outDir, 0700); err != nil {
4645
return nil, err
4746
}
48-
tmpFile, err := ioutil.TempFile(os.TempDir(), "gopls-x")
47+
tmpFile, err := os.CreateTemp(os.TempDir(), "gopls-x")
4948
if err != nil {
5049
return nil, err
5150
}
@@ -99,7 +98,7 @@ func GCOptimizationDetails(ctx context.Context, snapshot Snapshot, m *Metadata)
9998
}
10099

101100
func parseDetailsFile(filename string, options *Options) (span.URI, []*Diagnostic, error) {
102-
buf, err := ioutil.ReadFile(filename)
101+
buf, err := os.ReadFile(filename)
103102
if err != nil {
104103
return "", nil, err
105104
}

0 commit comments

Comments
 (0)