From 1e11d05bd820097463af874315e4a16256439d7f Mon Sep 17 00:00:00 2001 From: Rob Pike Date: Wed, 3 Sep 2014 16:49:14 -0700 Subject: [PATCH] cmd/vet: simplify file-reading code per gri LGTM=gri R=gri CC=golang-codereviews https://golang.org/cl/140960043 --- cmd/vet/main.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/cmd/vet/main.go b/cmd/vet/main.go index 783c1f35..0b74090c 100644 --- a/cmd/vet/main.go +++ b/cmd/vet/main.go @@ -307,22 +307,16 @@ func doPackage(directory string, names []string) bool { var astFiles []*ast.File fs := token.NewFileSet() for _, name := range names { - f, err := os.Open(name) + data, err := ioutil.ReadFile(name) if err != nil { // Warn but continue to next package. warnf("%s: %s", name, err) return false } - defer f.Close() - data, err := ioutil.ReadAll(f) - if err != nil { - warnf("%s: %s", name, err) - return false - } checkBuildTag(name, data) var parsedFile *ast.File if strings.HasSuffix(name, ".go") { - parsedFile, err = parser.ParseFile(fs, name, bytes.NewReader(data), 0) + parsedFile, err = parser.ParseFile(fs, name, data, 0) if err != nil { warnf("%s: %s", name, err) return false