From c3d0def3e546ec5258ffb3f02a58bd8c0470b6ea Mon Sep 17 00:00:00 2001 From: sanposhiho <44139130+sanposhiho@users.noreply.github.com> Date: Sat, 29 May 2021 15:14:59 +0900 Subject: [PATCH 1/2] Update: wastedassign to v2.0.5 --- go.mod | 4 ++-- go.sum | 8 ++++---- pkg/golinters/wastedassign.go | 2 +- test/testdata/wastedassign.go | 28 ++++++++++++++-------------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index 472ec67c9df2..3bfc0a370ab5 100644 --- a/go.mod +++ b/go.mod @@ -60,7 +60,7 @@ require ( github.com/polyfloyd/go-errorlint v0.0.0-20210510181950-ab96adb96fea github.com/ryancurrah/gomodguard v1.2.1 github.com/ryanrolds/sqlclosecheck v0.3.0 - github.com/sanposhiho/wastedassign v1.0.0 + github.com/sanposhiho/wastedassign/v2 v2.0.5 github.com/securego/gosec/v2 v2.7.0 github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c github.com/shirou/gopsutil/v3 v3.21.4 @@ -82,7 +82,7 @@ require ( github.com/uudashr/gocognit v1.0.1 github.com/valyala/quicktemplate v1.6.3 github.com/yeya24/promlinter v0.1.0 - golang.org/x/tools v0.1.2-0.20210512205948-8287d5da45e4 + golang.org/x/tools v0.1.2 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b honnef.co/go/tools v0.1.4 mvdan.cc/gofumpt v0.1.1 diff --git a/go.sum b/go.sum index a89c264f7281..dfa3be4addd9 100644 --- a/go.sum +++ b/go.sum @@ -544,8 +544,8 @@ github.com/ryancurrah/gomodguard v1.2.1/go.mod h1:tpI+C/nzvfUR3bF28b5QHpTn/jM/zl github.com/ryanrolds/sqlclosecheck v0.3.0 h1:AZx+Bixh8zdUBxUA1NxbxVAS78vTPq4rCb8OUZI9xFw= github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sanposhiho/wastedassign v1.0.0 h1:dB+7OV0iJ5b0SpGwKjKlPCr8GDZJX6Ylm3YG+66xGpc= -github.com/sanposhiho/wastedassign v1.0.0/go.mod h1:LGpq5Hsv74QaqM47WtIsRSF/ik9kqk07kchgv66tLVE= +github.com/sanposhiho/wastedassign/v2 v2.0.5 h1:adlFtxa8a/aavo3xWHZNPTRbmTy40E3loklVkWNkzYU= +github.com/sanposhiho/wastedassign/v2 v2.0.5/go.mod h1:rNVSQ9PqkqylfstLzhH881gVbrkmMMkwD2KomVvQjdQ= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/securego/gosec/v2 v2.7.0 h1:mOhJv5w6UyNLpSssQOQCc7eGkKLuicAxvf66Ey/X4xk= github.com/securego/gosec/v2 v2.7.0/go.mod h1:xNbGArrGUspJLuz3LS5XCY1EBW/0vABAl/LWfSklmiM= @@ -927,8 +927,8 @@ golang.org/x/tools v0.0.0-20201230224404-63754364767c/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210104081019-d8d6ddbec6ee/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.2-0.20210512205948-8287d5da45e4 h1:cYSqdOzmV9wJ7lWurRAws06Dmif0Wv6UL4gQLlz+im0= -golang.org/x/tools v0.1.2-0.20210512205948-8287d5da45e4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.2 h1:kRBLX7v7Af8W7Gdbbc908OJcdgtK8bOz9Uaj8/F1ACA= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= 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-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkg/golinters/wastedassign.go b/pkg/golinters/wastedassign.go index 9ce1afdd4810..d359fb019534 100644 --- a/pkg/golinters/wastedassign.go +++ b/pkg/golinters/wastedassign.go @@ -1,7 +1,7 @@ package golinters import ( - "github.com/sanposhiho/wastedassign" + "github.com/sanposhiho/wastedassign/v2" "golang.org/x/tools/go/analysis" "github.com/golangci/golangci-lint/pkg/golinters/goanalysis" diff --git a/test/testdata/wastedassign.go b/test/testdata/wastedassign.go index f1403b9ff3b7..09d658f1e564 100644 --- a/test/testdata/wastedassign.go +++ b/test/testdata/wastedassign.go @@ -27,28 +27,28 @@ func noUseParams(params string) int { func f(param int) int { println(param) - useOutOfIf := 1212121 // ERROR "assigned, but reassigned without using the value" + useOutOfIf := 1212121 // ERROR "assigned to useOutOfIf, but reassigned without using the value" ret := 0 if false { - useOutOfIf = 200 // ERROR "assigned, but never used afterwards" + useOutOfIf = 200 // ERROR "assigned to useOutOfIf, but never used afterwards" return 0 } else if param == 100 { - useOutOfIf = 100 // ERROR "assigned, but reassigned without using the value" + useOutOfIf = 100 // ERROR "assigned to useOutOfIf, but reassigned without using the value" useOutOfIf = 201 useOutOfIf = pa(useOutOfIf) - useOutOfIf += 200 // ERROR "assigned, but reassigned without using the value" + useOutOfIf += 200 // ERROR "assigned to useOutOfIf, but reassigned without using the value" } else { useOutOfIf = 100 useOutOfIf += 100 useOutOfIf = pa(useOutOfIf) - useOutOfIf += 200 // ERROR "assigned, but reassigned without using the value" + useOutOfIf += 200 // ERROR "assigned to useOutOfIf, but reassigned without using the value" } if false { - useOutOfIf = 200 // ERROR "assigned, but never used afterwards" + useOutOfIf = 200 // ERROR "assigned to useOutOfIf, but never used afterwards" return 0 } else if param == 200 { - useOutOfIf = 100 // ERROR "assigned, but reassigned without using the value" + useOutOfIf = 100 // ERROR "assigned to useOutOfIf, but reassigned without using the value" useOutOfIf = 201 useOutOfIf = pa(useOutOfIf) useOutOfIf += 200 @@ -62,7 +62,7 @@ func f(param int) int { println(useOutOfIf) useOutOfIf = 192 useOutOfIf += 100 - useOutOfIf += 200 // ERROR "assigned, but never used afterwards" + useOutOfIf += 200 // ERROR "assigned to useOutOfIf, but never used afterwards" return ret } @@ -71,7 +71,7 @@ func checkLoopTest() int { noUse := 1111 println(noUse) - noUse = 1111 // ERROR "assigned, but never used afterwards" + noUse = 1111 // ERROR "assigned to noUse, but never used afterwards" for { if hoge == 14 { break @@ -86,21 +86,21 @@ func r(param int) int { useOutOfIf := 1212121 ret := 0 if false { - useOutOfIf = 200 // ERROR "assigned, but never used afterwards" + useOutOfIf = 200 // ERROR "assigned to useOutOfIf, but never used afterwards" return 0 } else if param == 100 { ret = useOutOfIf } else if param == 200 { - useOutOfIf = 100 // ERROR "assigned, but reassigned without using the value" + useOutOfIf = 100 // ERROR "assigned to useOutOfIf, but reassigned without using the value" useOutOfIf = 100 useOutOfIf = pa(useOutOfIf) - useOutOfIf += 200 // ERROR "assigned, but reassigned without using the value" + useOutOfIf += 200 // ERROR "assigned to useOutOfIf, but reassigned without using the value" } useOutOfIf = 12 println(useOutOfIf) useOutOfIf = 192 useOutOfIf += 100 - useOutOfIf += 200 // ERROR "assigned, but never used afterwards" + useOutOfIf += 200 // ERROR "assigned to useOutOfIf, but never used afterwards" return ret } @@ -108,7 +108,7 @@ func mugen() { var i int var hoge int for { - hoge = 5 // ERROR "assigned, but reassigned without using the value" + hoge = 5 // ERROR "assigned to hoge, but reassigned without using the value" // break } From 1e077becc101b4411541c82cdcf3e35c497f9980 Mon Sep 17 00:00:00 2001 From: sanposhiho <44139130+sanposhiho@users.noreply.github.com> Date: Sat, 29 May 2021 15:44:07 +0900 Subject: [PATCH 2/2] Update: wastedassign to v2.0.6 --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 3bfc0a370ab5..0295d31eab61 100644 --- a/go.mod +++ b/go.mod @@ -60,7 +60,7 @@ require ( github.com/polyfloyd/go-errorlint v0.0.0-20210510181950-ab96adb96fea github.com/ryancurrah/gomodguard v1.2.1 github.com/ryanrolds/sqlclosecheck v0.3.0 - github.com/sanposhiho/wastedassign/v2 v2.0.5 + github.com/sanposhiho/wastedassign/v2 v2.0.6 github.com/securego/gosec/v2 v2.7.0 github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c github.com/shirou/gopsutil/v3 v3.21.4 @@ -82,7 +82,7 @@ require ( github.com/uudashr/gocognit v1.0.1 github.com/valyala/quicktemplate v1.6.3 github.com/yeya24/promlinter v0.1.0 - golang.org/x/tools v0.1.2 + golang.org/x/tools v0.1.2-0.20210512205948-8287d5da45e4 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b honnef.co/go/tools v0.1.4 mvdan.cc/gofumpt v0.1.1 diff --git a/go.sum b/go.sum index dfa3be4addd9..02c28b513281 100644 --- a/go.sum +++ b/go.sum @@ -544,8 +544,8 @@ github.com/ryancurrah/gomodguard v1.2.1/go.mod h1:tpI+C/nzvfUR3bF28b5QHpTn/jM/zl github.com/ryanrolds/sqlclosecheck v0.3.0 h1:AZx+Bixh8zdUBxUA1NxbxVAS78vTPq4rCb8OUZI9xFw= github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sanposhiho/wastedassign/v2 v2.0.5 h1:adlFtxa8a/aavo3xWHZNPTRbmTy40E3loklVkWNkzYU= -github.com/sanposhiho/wastedassign/v2 v2.0.5/go.mod h1:rNVSQ9PqkqylfstLzhH881gVbrkmMMkwD2KomVvQjdQ= +github.com/sanposhiho/wastedassign/v2 v2.0.6 h1:+6/hQIHKNJAUixEj6EmOngGIisyeI+T3335lYTyxRoA= +github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/securego/gosec/v2 v2.7.0 h1:mOhJv5w6UyNLpSssQOQCc7eGkKLuicAxvf66Ey/X4xk= github.com/securego/gosec/v2 v2.7.0/go.mod h1:xNbGArrGUspJLuz3LS5XCY1EBW/0vABAl/LWfSklmiM= @@ -927,8 +927,8 @@ golang.org/x/tools v0.0.0-20201230224404-63754364767c/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210104081019-d8d6ddbec6ee/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.2 h1:kRBLX7v7Af8W7Gdbbc908OJcdgtK8bOz9Uaj8/F1ACA= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.2-0.20210512205948-8287d5da45e4 h1:cYSqdOzmV9wJ7lWurRAws06Dmif0Wv6UL4gQLlz+im0= +golang.org/x/tools v0.1.2-0.20210512205948-8287d5da45e4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= 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-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=