Skip to content
This repository has been archived by the owner on Oct 7, 2023. It is now read-only.

cleanup: remove ioutil for new go version #122

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bench_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package zetcd

import (
"fmt"
"io/ioutil"
"io"
"log"
"testing"
"time"
Expand All @@ -31,7 +31,7 @@ const (

var acl = zk.WorldACL(zk.PermAll)

func init() { zk.DefaultLogger = log.New(ioutil.Discard, "", 0) }
func init() { zk.DefaultLogger = log.New(io.Discard, "", 0) }

func benchGet(b *testing.B, addr string) {
c, _, err := zk.Connect([]string{addr}, time.Second)
Expand Down
5 changes: 1 addition & 4 deletions integration/docker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,9 @@ import (
"archive/tar"
"bytes"
"io"
"io/ioutil"
"os"
"strings"
"time"

"github.com/fsouza/go-dockerclient"
)

type Container struct {
Expand Down Expand Up @@ -129,7 +126,7 @@ func buildTar(files ...string) (io.Reader, error) {
defer tr.Close()
now := time.Now()
for _, f := range files {
dat, derr := ioutil.ReadFile(f)
dat, derr := os.ReadFile(f)
if derr != nil {
return nil, derr
}
Expand Down