From bbb0e6b208fdc2507cb1b01d0a1510780911295b Mon Sep 17 00:00:00 2001 From: Denis Isaev Date: Mon, 30 Sep 2019 22:14:47 +0300 Subject: [PATCH] update bodyclose --- go.mod | 2 +- go.sum | 4 ++-- .../timakin/bodyclose/passes/bodyclose/bodyclose.go | 2 +- vendor/modules.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index b018dec5..51e7d844 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.4.0 github.com/stretchr/testify v1.4.0 - github.com/timakin/bodyclose v0.0.0-20190926151346-866fdb772e33 + github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e github.com/ultraware/funlen v0.0.2 github.com/ultraware/whitespace v0.0.3 github.com/valyala/quicktemplate v1.2.0 diff --git a/go.sum b/go.sum index d1d57227..570a2b62 100644 --- a/go.sum +++ b/go.sum @@ -225,8 +225,8 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/timakin/bodyclose v0.0.0-20190926151346-866fdb772e33 h1:x0Cqy/vndAeVooVIsYzYl3U+/dPj8p7hj1gwsXqWSeU= -github.com/timakin/bodyclose v0.0.0-20190926151346-866fdb772e33/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= +github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e h1:RumXZ56IrCj4CL+g1b9OL/oH0QnsF976bC8xQFYUD5Q= +github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= diff --git a/vendor/github.com/timakin/bodyclose/passes/bodyclose/bodyclose.go b/vendor/github.com/timakin/bodyclose/passes/bodyclose/bodyclose.go index 4cf577fb..3c702ab5 100644 --- a/vendor/github.com/timakin/bodyclose/passes/bodyclose/bodyclose.go +++ b/vendor/github.com/timakin/bodyclose/passes/bodyclose/bodyclose.go @@ -314,7 +314,7 @@ func (r *runner) calledInFunc(f *ssa.Function, called bool) bool { for _, r := range refs { if v, ok := r.(ssa.Value); ok { if ptr, ok := v.Type().(*types.Pointer); !ok || !isNamedType(ptr.Elem(), "io", "ReadCloser") { - return true + continue } vrefs := *v.Referrers() for _, vref := range vrefs { diff --git a/vendor/modules.txt b/vendor/modules.txt index 5b232b93..77b1086d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -164,7 +164,7 @@ github.com/stretchr/objx github.com/stretchr/testify/assert github.com/stretchr/testify/mock github.com/stretchr/testify/require -# github.com/timakin/bodyclose v0.0.0-20190926151346-866fdb772e33 +# github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e github.com/timakin/bodyclose/passes/bodyclose # github.com/ultraware/funlen v0.0.2 github.com/ultraware/funlen