aboutsummaryrefslogtreecommitdiff
path: root/src/time/genzabbrs.go
diff options
context:
space:
mode:
authorCherry Zhang <cherryyz@google.com>2020-10-28 09:12:20 -0400
committerCherry Zhang <cherryyz@google.com>2020-10-28 09:12:20 -0400
commita16e30d162c1c7408db7821e7b9513cefa09c6ca (patch)
treeaf752ba9ba44c547df39bb0af9bff79f610ba9d5 /src/time/genzabbrs.go
parent91e4d2d57bc341dd82c98247117114c851380aef (diff)
parentcf6cfba4d5358404dd890f6025e573a4b2156543 (diff)
downloadgo-dev.link.tar.gz
go-dev.link.zip
[dev.link] all: merge branch 'master' into dev.linkdev.link
Clean merge. Change-Id: Ia7b2808bc649790198d34c226a61d9e569084dc5
Diffstat (limited to 'src/time/genzabbrs.go')
-rw-r--r--src/time/genzabbrs.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/time/genzabbrs.go b/src/time/genzabbrs.go
index 38397f91b7..1d59ba73ce 100644
--- a/src/time/genzabbrs.go
+++ b/src/time/genzabbrs.go
@@ -17,6 +17,7 @@ import (
"encoding/xml"
"flag"
"go/format"
+ "io"
"io/ioutil"
"log"
"net/http"
@@ -71,7 +72,7 @@ func readWindowsZones() ([]*zone, error) {
}
defer r.Body.Close()
- data, err := ioutil.ReadAll(r.Body)
+ data, err := io.ReadAll(r.Body)
if err != nil {
return nil, err
}