chore: remove refs to deprecated io/ioutil

llgcode · Jul 23, 2023 · eb90594 · eb90594
1 parent 80aa0a2
commit eb90594
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/font.go b/font.go
@@ -4,8 +4,8 @@
 package draw2d
 
 import (
-	"io/ioutil"
 	"log"
+	"os"
 	"path/filepath"
 
 	"github.com/golang/freetype/truetype"
@@ -143,7 +143,7 @@ func (cache *FolderFontCache) Load(fontData FontData) (font *truetype.Font, err
 	var data []byte
 	var file = cache.namer(fontData)
 
-	if data, err = ioutil.ReadFile(filepath.Join(cache.folder, file)); err != nil {
+	if data, err = os.ReadFile(filepath.Join(cache.folder, file)); err != nil {
 		return
 	}
 
@@ -202,7 +202,7 @@ func (cache *SyncFolderFontCache) Load(fontData FontData) (font *truetype.Font,
 	var data []byte
 	var file = cache.namer(fontData)
 
-	if data, err = ioutil.ReadFile(filepath.Join(cache.folder, file)); err != nil {
+	if data, err = os.ReadFile(filepath.Join(cache.folder, file)); err != nil {
 		return
 	}
 

diff --git a/go.mod b/go.mod
@@ -1,5 +1,7 @@
 module github.com/llgcode/draw2d
 
+go 1.20
+
 require (
 	github.com/go-gl/gl v0.0.0-20180407155706-68e253793080
 	github.com/go-gl/glfw v0.0.0-20180426074136-46a8d530c326

diff --git a/samples/postscript/postscript.go b/samples/postscript/postscript.go
@@ -2,7 +2,7 @@
 package postscript
 
 import (
-	"io/ioutil"
+	"io"
 	"os"
 	"strings"
 
@@ -40,7 +40,7 @@ func Draw(gc draw2d.GraphicContext, filename string) {
 		panic(err)
 	}
 	defer src.Close()
-	bytes, err := ioutil.ReadAll(src)
+	bytes, err := io.ReadAll(src)
 	reader := strings.NewReader(string(bytes))
 
 	// Initialize and interpret the postscript

diff --git a/samples/postscriptgl/postscriptgl.go b/samples/postscriptgl/postscriptgl.go
@@ -2,7 +2,7 @@
 package main
 
 import (
-	"io/ioutil"
+	"io"
 	"log"
 	"math"
 	"os"
@@ -69,7 +69,7 @@ func main() {
 		return
 	}
 	defer src.Close()
-	bytes, err := ioutil.ReadAll(src)
+	bytes, err := io.ReadAll(src)
 	postscriptContent = string(bytes)
 	err = glfw.Init()
 	if err != nil {