From 3367ff8dff3b08d55c4e0f80a959ecc5f09ed532 Mon Sep 17 00:00:00 2001 From: Sergey Dobrodey Date: Thu, 28 Apr 2022 15:16:08 +0300 Subject: [PATCH 1/2] go: use https://go-review.googlesource.com/c/tools/+/400034/ --- cmd/goverter/main.go | 2 +- go.mod | 5 +++-- go.sum | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cmd/goverter/main.go b/cmd/goverter/main.go index e6fa8b67..35caa1bd 100644 --- a/cmd/goverter/main.go +++ b/cmd/goverter/main.go @@ -6,7 +6,7 @@ import ( "os" "strings" - goverter "github.com/jmattheis/goverter" + goverter "github.com/sergeydobrodey/goverter" ) func main() { diff --git a/go.mod b/go.mod index 80075db7..b0b57f21 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,12 @@ -module github.com/jmattheis/goverter +module github.com/sergeydobrodey/goverter go 1.16 require ( github.com/dave/jennifer v1.5.0 + github.com/jmattheis/goverter v0.6.2 github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.7.1 - golang.org/x/tools v0.1.10 + golang.org/x/tools v0.1.11-0.20220413170336-afc6aad76eb1 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ) diff --git a/go.sum b/go.sum index 72848445..a854b021 100644 --- a/go.sum +++ b/go.sum @@ -9,10 +9,13 @@ github.com/dave/patsy v0.0.0-20210517141501-957256f50cba/go.mod h1:qfR88CgEGLoiq github.com/dave/rebecca v0.9.1/go.mod h1:N6XYdMD/OKw3lkF3ywh8Z6wPGuwNFDNtWYEMFWEmXBA= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/jmattheis/goverter v0.6.2 h1:8+nI3/sciVI851v3Doq7QVCXWhkJlEEofHwfbzbeBlk= +github.com/jmattheis/goverter v0.6.2/go.mod h1:w0hePhHH4CG/6Nc3mYCs2gm9GeFaEChmTmq0FaeKzKc= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/reillywatson/tools v0.0.0-20220322163840-50e5cab0be89/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -46,6 +49,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.11-0.20220413170336-afc6aad76eb1 h1:Z3vE1sGlC7qiyFJkkDcZms8Y3+yV8+W7HmDSmuf71tM= +golang.org/x/tools v0.1.11-0.20220413170336-afc6aad76eb1/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= From 6224f5d7bd319517a82a8feafbceb5ccc5c886f6 Mon Sep 17 00:00:00 2001 From: Sergey Dobrodey Date: Fri, 29 Apr 2022 14:38:08 +0300 Subject: [PATCH 2/2] go: use x/tools with `generics` support --- cmd/goverter/main.go | 2 +- go.mod | 3 +-- go.sum | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/cmd/goverter/main.go b/cmd/goverter/main.go index 35caa1bd..e6fa8b67 100644 --- a/cmd/goverter/main.go +++ b/cmd/goverter/main.go @@ -6,7 +6,7 @@ import ( "os" "strings" - goverter "github.com/sergeydobrodey/goverter" + goverter "github.com/jmattheis/goverter" ) func main() { diff --git a/go.mod b/go.mod index b0b57f21..8b8fdc3b 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,9 @@ -module github.com/sergeydobrodey/goverter +module github.com/jmattheis/goverter go 1.16 require ( github.com/dave/jennifer v1.5.0 - github.com/jmattheis/goverter v0.6.2 github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.7.1 golang.org/x/tools v0.1.11-0.20220413170336-afc6aad76eb1 diff --git a/go.sum b/go.sum index a854b021..936a29f3 100644 --- a/go.sum +++ b/go.sum @@ -9,13 +9,10 @@ github.com/dave/patsy v0.0.0-20210517141501-957256f50cba/go.mod h1:qfR88CgEGLoiq github.com/dave/rebecca v0.9.1/go.mod h1:N6XYdMD/OKw3lkF3ywh8Z6wPGuwNFDNtWYEMFWEmXBA= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/jmattheis/goverter v0.6.2 h1:8+nI3/sciVI851v3Doq7QVCXWhkJlEEofHwfbzbeBlk= -github.com/jmattheis/goverter v0.6.2/go.mod h1:w0hePhHH4CG/6Nc3mYCs2gm9GeFaEChmTmq0FaeKzKc= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/reillywatson/tools v0.0.0-20220322163840-50e5cab0be89/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -47,8 +44,6 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= -golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.11-0.20220413170336-afc6aad76eb1 h1:Z3vE1sGlC7qiyFJkkDcZms8Y3+yV8+W7HmDSmuf71tM= golang.org/x/tools v0.1.11-0.20220413170336-afc6aad76eb1/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=