aboutsummaryrefslogtreecommitdiff
path: root/script
diff options
context:
space:
mode:
authorJakob Borg <jakob@kastelo.net>2021-11-22 08:59:47 +0100
committerGitHub <noreply@github.com>2021-11-22 08:59:47 +0100
commit4b750b6dc3dc9904c6046d1c6370b57e1710cb4b (patch)
tree854c15b50d46d64f228018de89b326e290f79025 /script
parentbf89bffb0b844cfafc8a38467870157e52e6f198 (diff)
downloadsyncthing-4b750b6dc3dc9904c6046d1c6370b57e1710cb4b.tar.gz
syncthing-4b750b6dc3dc9904c6046d1c6370b57e1710cb4b.zip
all: Remove usage of deprecated io/ioutil (#7971)
As of Go 1.16 io/ioutil is deprecated. This replaces usage with the corresponding functions in package os and package io.
Diffstat (limited to 'script')
-rw-r--r--script/authors.go6
-rw-r--r--script/commit-msg.go3
-rw-r--r--script/genassets.go3
-rw-r--r--script/prune_mocks.go3
-rw-r--r--script/transifexdl.go4
5 files changed, 8 insertions, 11 deletions
diff --git a/script/authors.go b/script/authors.go
index 3068aebd5..37fa76bbe 100644
--- a/script/authors.go
+++ b/script/authors.go
@@ -15,7 +15,7 @@ package main
import (
"bytes"
"fmt"
- "io/ioutil"
+ "io"
"log"
"math"
"os"
@@ -108,7 +108,7 @@ func main() {
bs := readAll(htmlFile)
bs = authorsRe.ReplaceAll(bs, []byte("id=\"contributor-list\">\n"+replacement+"\n </div>"))
- if err := ioutil.WriteFile(htmlFile, bs, 0644); err != nil {
+ if err := os.WriteFile(htmlFile, bs, 0644); err != nil {
log.Fatal(err)
}
@@ -173,7 +173,7 @@ func readAll(path string) []byte {
}
defer fd.Close()
- bs, err := ioutil.ReadAll(fd)
+ bs, err := io.ReadAll(fd)
if err != nil {
log.Fatal(err)
}
diff --git a/script/commit-msg.go b/script/commit-msg.go
index c5e178dea..fa1a13d16 100644
--- a/script/commit-msg.go
+++ b/script/commit-msg.go
@@ -12,7 +12,6 @@ package main
import (
"bytes"
"fmt"
- "io/ioutil"
"os"
"path/filepath"
"regexp"
@@ -31,7 +30,7 @@ func main() {
os.Exit(exitError)
}
- bs, err := ioutil.ReadFile(os.Args[1])
+ bs, err := os.ReadFile(os.Args[1])
if err != nil {
fmt.Println("Reading input:", err)
os.Exit(exitError)
diff --git a/script/genassets.go b/script/genassets.go
index 71f965ab9..4d1b636f6 100644
--- a/script/genassets.go
+++ b/script/genassets.go
@@ -16,7 +16,6 @@ import (
"fmt"
"go/format"
"io"
- "io/ioutil"
"os"
"path/filepath"
"strconv"
@@ -74,7 +73,7 @@ func walkerFor(basePath string) filepath.WalkFunc {
}
if info.Mode().IsRegular() {
- data, err := ioutil.ReadFile(name)
+ data, err := os.ReadFile(name)
if err != nil {
return err
}
diff --git a/script/prune_mocks.go b/script/prune_mocks.go
index ba9241027..ab56c3e08 100644
--- a/script/prune_mocks.go
+++ b/script/prune_mocks.go
@@ -12,7 +12,6 @@ package main
import (
"bufio"
"flag"
- "io/ioutil"
"log"
"os"
"os/exec"
@@ -51,7 +50,7 @@ func pruneInterfaceCheck(path string, size int64) error {
}
defer fd.Close()
- tmp, err := ioutil.TempFile(".", "")
+ tmp, err := os.CreateTemp(".", "")
if err != nil {
return err
}
diff --git a/script/transifexdl.go b/script/transifexdl.go
index 321bdab6f..abb5291cf 100644
--- a/script/transifexdl.go
+++ b/script/transifexdl.go
@@ -12,7 +12,7 @@ package main
import (
"encoding/json"
"fmt"
- "io/ioutil"
+ "io"
"log"
"net/http"
"os"
@@ -140,7 +140,7 @@ func loadValidLangs() []string {
log.Fatal(err)
}
defer fd.Close()
- bs, err := ioutil.ReadAll(fd)
+ bs, err := io.ReadAll(fd)
if err != nil {
log.Fatal(err)
}