Remove use of io/ioutil

caddyserver · Sep 30, 2022 · 2b5d89d · 2b5d89d
1 parent e09becb
commit 2b5d89d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,6 +1,6 @@
 linters-settings:
   errcheck:
-    ignore: fmt:.*,io/ioutil:^Read.*
+    ignore: fmt:.*:^Read.*
     ignoretests: true
   misspell:
     locale: US

diff --git a/builder.go b/builder.go
@@ -17,7 +17,6 @@ package xcaddy
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"path"
@@ -227,7 +226,7 @@ func newTempFolder() (string, error) {
 		}
 	}
 	ts := time.Now().Format(yearMonthDayHourMin)
-	return ioutil.TempDir(parentDir, fmt.Sprintf("buildenv_%s.", ts))
+	return os.MkdirTemp(parentDir, fmt.Sprintf("buildenv_%s.", ts))
 }
 
 // versionedModulePath helps enforce Go Module's Semantic Import Versioning (SIV) by

diff --git a/environment.go b/environment.go
@@ -18,7 +18,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -87,7 +86,7 @@ func (b Builder) newEnvironment(ctx context.Context) (*environment, error) {
 	// write the main module file to temporary folder
 	mainPath := filepath.Join(tempFolder, "main.go")
 	log.Printf("[INFO] Writing main module: %s\n%s", mainPath, buf.Bytes())
-	err = ioutil.WriteFile(mainPath, buf.Bytes(), 0644)
+	err = os.WriteFile(mainPath, buf.Bytes(), 0644)
 	if err != nil {
 		return nil, err
 	}