Remove deprecated ioutil

speedata · Aug 27, 2023 · a218863 · a218863
1 parent 814c259
commit a218863
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/helper/changelog/changelog.go b/helper/changelog/changelog.go
@@ -3,7 3,7 @@ package changelog
 
 import (
  "encoding/xml"
- "io/ioutil"
  "os"
  "path/filepath"
 
  "github.com/speedata/xts/helper/config"
@@ -32,7 32,7 @@ type Changelog struct {
 }
 
 func parseChangelog(filename string) (*Changelog, error) {
- data, err := ioutil.ReadFile(filename)
  data, err := os.ReadFile(filename)
  if err != nil {
  return nil, err
  }

diff --git a/helper/genschema/commandsxml.go b/helper/genschema/commandsxml.go
@@ -2,7 2,7 @@ package genschema
 
 import (
  "encoding/xml"
- "io/ioutil"
  "os"
  "path/filepath"
  "strings"
 )
@@ -103,7 103,7 @@ type commandsXML struct {
 }
 
 func readCommandsFile(basedir string) (*commandsXML, error) {
- commandsdata, err := ioutil.ReadFile(filepath.Join(basedir, "doc", "commands-xml", "commands.xml"))
  commandsdata, err := os.ReadFile(filepath.Join(basedir, "doc", "commands-xml", "commands.xml"))
  if err != nil {
  return nil, err
  }

diff --git a/helper/genschema/genschema.go b/helper/genschema/genschema.go
@@ -3,7 3,7 @@ package genschema
 
 import (
  "fmt"
- "io/ioutil"
  "os"
  "os/exec"
  "path/filepath"
 
@@ -36,7 36,7 @@ func DoThings(cfg *config.Config) error {
  if err != nil {
  return err
  }
- err = ioutil.WriteFile(rngSchemaENPath, buf, 0644)
  err = os.WriteFile(rngSchemaENPath, buf, 0644)
  if err != nil {
  return err
  }
@@ -45,7 45,7 @@ func DoThings(cfg *config.Config) error {
  if err != nil {
  return err
  }
- err = ioutil.WriteFile(rngSchemaDEPath, buf, 0644)
  err = os.WriteFile(rngSchemaDEPath, buf, 0644)
  if err != nil {
  return err
  }
@@ -68,15 68,15 @@ func DoThings(cfg *config.Config) error {
  if err != nil {
  return err
  }
- err = ioutil.WriteFile(rngSchemaENPath, buf, 0644)
  err = os.WriteFile(rngSchemaENPath, buf, 0644)
  if err != nil {
  return err
  }
  buf, err = genRelaxNGSchema(c, "de", true)
  if err != nil {
  return err
  }
- err = ioutil.WriteFile(rngSchemaDEPath, buf, 0644)
  err = os.WriteFile(rngSchemaDEPath, buf, 0644)
  if err != nil {
  return err
  }

diff --git a/xts/luacsv/luacsv.go b/xts/luacsv/luacsv.go
@@ -5,7 5,6 @@ import (
  "encoding/csv"
  "fmt"
  "io"
- "io/ioutil"
  "os"
  "regexp"
 
@@ -65,7 64,7 @@ func decode(l *lua.LState) int {
  rd = charmap.ISO8859_1.NewDecoder().Reader(rd)
  }
 
- data, err := ioutil.ReadAll(rd)
  data, err := io.ReadAll(rd)
  if err != nil {
  return lerr(l, err.Error())
  }

diff --git a/xts/luaxml/luaxml.go b/xts/luaxml/luaxml.go
@@ -4,7 4,7 @@ import (
  "bytes"
  "encoding/xml"
  "fmt"
- "io/ioutil"
  "os"
 
  lua "github.com/yuin/gopher-lua"
 )
@@ -120,7 120,7 @@ func encodeTable(l *lua.LState) int {
  l.SetTop(0)
  l.Push(lua.LTrue)
  enc.Flush()
- ioutil.WriteFile(filename, b.Bytes(), 0644)
  os.WriteFile(filename, b.Bytes(), 0644)
  return 1
 }
 

diff --git a/xts/main.go b/xts/main.go
@@ -3,7 3,6 @@ package main
 import (
  "fmt"
  "io"
- "io/ioutil"
  "log/slog"
  "os"
  "os/exec"
@@ -150,12 149,12 @@ func scaffold(extra ...string) error {
 </Layout>
 `
 
- err = ioutil.WriteFile("data.xml", []byte(dataTxt), 0644)
  err = os.WriteFile("data.xml", []byte(dataTxt), 0644)
  if err != nil {
  return err
  }
 
- err = ioutil.WriteFile("layout.xml", []byte(layoutTxt), 0644)
  err = os.WriteFile("layout.xml", []byte(layoutTxt), 0644)
  if err != nil {
  return err
  }