From 136b27171afa734bead9531471c1cf6820bed558 Mon Sep 17 00:00:00 2001 From: Isaev Denis Date: Mon, 9 Sep 2019 16:35:16 +0300 Subject: [PATCH] update bodyclose: use upstream version (#666) --- go.mod | 11 +++-------- go.sum | 4 ++-- vendor/modules.txt | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index d7cb08a5d230..76c7e446397e 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/spf13/pflag v1.0.1 github.com/spf13/viper v1.0.2 github.com/stretchr/testify v1.2.2 - github.com/timakin/bodyclose v0.0.0-00010101000000-000000000000 + github.com/timakin/bodyclose v0.0.0-00010101000000-87058b9bfcec github.com/valyala/quicktemplate v1.1.1 golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a // indirect golang.org/x/sys v0.0.0-20190312061237-fead79001313 // indirect @@ -62,10 +62,5 @@ require ( mvdan.cc/unparam v0.0.0-20190124213536-fbb59629db34 ) -replace ( - // https://github.com/timakin/bodyclose/pull/17 - github.com/timakin/bodyclose => github.com/golangci/bodyclose v0.0.0-20190713050349-65da19158fa2 - - // https://github.com/golang/tools/pull/139 - golang.org/x/tools => github.com/golangci/tools v0.0.0-20190713050349-979bdb7f8cc8 -) +// https://github.com/golang/tools/pull/139 +replace golang.org/x/tools => github.com/golangci/tools v0.0.0-20190713050349-979bdb7f8cc8 diff --git a/go.sum b/go.sum index 7c1240124d4a..631595838a6e 100644 --- a/go.sum +++ b/go.sum @@ -49,8 +49,6 @@ github.com/golang/mock v1.0.0 h1:HzcpUG60pfl43n9d2qbdi/3l1uKpAmxlfWEPWtV/QxM= github.com/golang/mock v1.0.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golangci/bodyclose v0.0.0-20190713050349-65da19158fa2 h1:RDWiBQrrsIhyHdWW/4d0jHMlfwKouMtnsjSJ6AzuBHg= -github.com/golangci/bodyclose v0.0.0-20190713050349-65da19158fa2/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM= @@ -166,6 +164,8 @@ github.com/spf13/viper v1.0.2 h1:Ncr3ZIuJn322w2k1qmzXDnkLAdQMlJqBa9kfAH+irso= github.com/spf13/viper v1.0.2/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/timakin/bodyclose v0.0.0-00010101000000-87058b9bfcec h1:Ha5Eixh5Dgi14hDFFWsxoB/jR95rHjB1biKdK9VKkbQ= +github.com/timakin/bodyclose v0.0.0-00010101000000-87058b9bfcec/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s= diff --git a/vendor/modules.txt b/vendor/modules.txt index 11efbd3ea604..66502bc0cf31 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -181,7 +181,7 @@ github.com/spf13/viper # github.com/stretchr/testify v1.2.2 github.com/stretchr/testify/assert github.com/stretchr/testify/require -# github.com/timakin/bodyclose v0.0.0-00010101000000-000000000000 => github.com/golangci/bodyclose v0.0.0-20190713050349-65da19158fa2 +# github.com/timakin/bodyclose v0.0.0-00010101000000-87058b9bfcec github.com/timakin/bodyclose/passes/bodyclose # github.com/valyala/bytebufferpool v1.0.0 github.com/valyala/bytebufferpool