[vuln] all: replace 'interface{}' with 'any'
8 views
Skip to first unread message
Oleksandr Redko (Gerrit)
Apr 28, 2023, 8:35:40 AM4/28/23
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Oleksandr Redko has uploaded this change for review.
all: replace 'interface{}' with 'any'
Change-Id: Icaa0540154dab452277d20b1e38430d89b3142e8
---
M internal/derrors/derrors.go
M internal/scan/source_test.go
M internal/vulncheck/binary_test.go
M internal/vulncheck/slicing_test.go
M internal/vulncheck/source_test.go
M internal/vulncheck/vulncheck_test.go
6 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/internal/derrors/derrors.go b/internal/derrors/derrors.go
index cc1259b..34191b9 100644
--- a/internal/derrors/derrors.go
+++ b/internal/derrors/derrors.go
@@ -16,7 +16,7 @@
// Example:
//
// defer derrors.Wrap(&err, "copy(%s, %s)", dst, src)
-func Wrap(errp *error, format string, args ...interface{}) {
+func Wrap(errp *error, format string, args ...any) {
if *errp != nil {
*errp = fmt.Errorf("%s: %w", fmt.Sprintf(format, args...), *errp)
}
diff --git a/internal/scan/source_test.go b/internal/scan/source_test.go
index 62b958d..661f5fe 100644
--- a/internal/scan/source_test.go
+++ b/internal/scan/source_test.go
@@ -154,7 +154,7 @@
e := packagestest.Export(t, packagestest.Modules, []packagestest.Module{
{
Name: "golang.org/entry",
- Files: map[string]interface{}{
+ Files: map[string]any{
"x/x.go": `
package x
@@ -167,7 +167,7 @@
},
{
Name: "golang.org/am...@v0.5.0",
- Files: map[string]interface{}{"avuln/avuln.go": `
+ Files: map[string]any{"avuln/avuln.go": `
package avuln
func init() {
@@ -179,7 +179,7 @@
},
{
Name: "golang.org/bm...@v0.5.0",
- Files: map[string]interface{}{"b/b.go": `
+ Files: map[string]any{"b/b.go": `
package b
import _ "golang.org/cmod/cvuln"
@@ -187,7 +187,7 @@
},
{
Name: "golang.org/cm...@v0.5.0",
- Files: map[string]interface{}{"cvuln/cvuln.go": `
+ Files: map[string]any{"cvuln/cvuln.go": `
package cvuln
var x int = C()
diff --git a/internal/vulncheck/binary_test.go b/internal/vulncheck/binary_test.go
index e60ed0d..2f168cc 100644
--- a/internal/vulncheck/binary_test.go
+++ b/internal/vulncheck/binary_test.go
@@ -34,7 +34,7 @@
e := packagestest.Export(t, packagestest.Modules, []packagestest.Module{
{
Name: "golang.org/entry",
- Files: map[string]interface{}{
+ Files: map[string]any{
"main.go": `
package main
@@ -55,7 +55,7 @@
}},
{
Name: "golang.org/cm...@v1.1.3",
- Files: map[string]interface{}{"c/c.go": `
+ Files: map[string]any{"c/c.go": `
package c
import (
@@ -70,7 +70,7 @@
},
{
Name: "golang.org/am...@v1.1.3",
- Files: map[string]interface{}{"avuln/avuln.go": `
+ Files: map[string]any{"avuln/avuln.go": `
package avuln
type VulnData struct {}
@@ -86,7 +86,7 @@
},
{
Name: "golang.org/bm...@v0.5.0",
- Files: map[string]interface{}{"bvuln/bvuln.go": `
+ Files: map[string]any{"bvuln/bvuln.go": `
package bvuln
func Vuln() {
@@ -226,7 +226,7 @@
e := packagestest.Export(t, packagestest.Modules, []packagestest.Module{
{
Name: "golang.org/entry",
- Files: map[string]interface{}{
+ Files: map[string]any{
"main.go": `
package main
@@ -241,7 +241,7 @@
}},
{
Name: "golang.org/bm...@v0.5.0",
- Files: map[string]interface{}{"bvuln/bvuln.go": fmt.Sprintf(vulnLib, tc.gl)},
+ Files: map[string]any{"bvuln/bvuln.go": fmt.Sprintf(vulnLib, tc.gl)},
},
})
defer e.Cleanup()
diff --git a/internal/vulncheck/slicing_test.go b/internal/vulncheck/slicing_test.go
index dfaa241..596c429 100644
--- a/internal/vulncheck/slicing_test.go
+++ b/internal/vulncheck/slicing_test.go
@@ -87,7 +87,7 @@
e := packagestest.Export(t, packagestest.Modules, []packagestest.Module{
{
Name: "some/module",
- Files: map[string]interface{}{"slice/slice.go": p},
+ Files: map[string]any{"slice/slice.go": p},
},
})
diff --git a/internal/vulncheck/source_test.go b/internal/vulncheck/source_test.go
index ed6d206..a24dbf4 100644
--- a/internal/vulncheck/source_test.go
+++ b/internal/vulncheck/source_test.go
@@ -38,7 +38,7 @@
e := packagestest.Export(t, packagestest.Modules, []packagestest.Module{
{
Name: "golang.org/entry",
- Files: map[string]interface{}{
+ Files: map[string]any{
"x/x.go": `
package x
@@ -63,7 +63,7 @@
`}},
{
Name: "golang.org/zm...@v0.0.0",
- Files: map[string]interface{}{"z/z.go": `
+ Files: map[string]any{"z/z.go": `
package z
import "archive/zip"
@@ -75,7 +75,7 @@
},
{
Name: "golang.org/am...@v1.1.3",
- Files: map[string]interface{}{"avuln/avuln.go": `
+ Files: map[string]any{"avuln/avuln.go": `
package avuln
import "golang.org/wmod/w"
@@ -87,7 +87,7 @@
},
{
Name: "golang.org/bm...@v0.5.0",
- Files: map[string]interface{}{"bvuln/bvuln.go": `
+ Files: map[string]any{"bvuln/bvuln.go": `
package bvuln
import _ "golang.org/cmod/c"
@@ -97,13 +97,13 @@
},
{
Name: "golang.org/cm...@v0.3.0",
- Files: map[string]interface{}{"c/c.go": `
+ Files: map[string]any{"c/c.go": `
package c
`},
},
{
Name: "golang.org/wm...@v0.0.0",
- Files: map[string]interface{}{"w/w.go": `
+ Files: map[string]any{"w/w.go": `
package w
import "golang.org/bmod/bvuln"
@@ -208,7 +208,7 @@
e := packagestest.Export(t, packagestest.Modules, []packagestest.Module{
{
Name: "golang.org/entry",
- Files: map[string]interface{}{
+ Files: map[string]any{
"x/x.go": `
package x
@@ -220,7 +220,7 @@
},
{
Name: "golang.org/im...@v0.0.0",
- Files: map[string]interface{}{
+ Files: map[string]any{
"i/i.go": `
package i
@@ -229,7 +229,7 @@
},
{
Name: "golang.org/im...@v0.0.0",
- Files: map[string]interface{}{
+ Files: map[string]any{
"i/i.go": `
package i
@@ -238,7 +238,7 @@
},
{
Name: "golang.org/am...@v0.0.1",
- Files: map[string]interface{}{"a1/a1.go": `
+ Files: map[string]any{"a1/a1.go": `
package a1
import _ "golang.org/amod/a2"
@@ -251,7 +251,7 @@
`}},
{
Name: "golang.org/bm...@v0.5.0",
- Files: map[string]interface{}{"bvuln/bvuln.go": `
+ Files: map[string]any{"bvuln/bvuln.go": `
package bvuln
func Vuln() {}
@@ -369,7 +369,7 @@
e := packagestest.Export(t, packagestest.Modules, []packagestest.Module{
{
Name: "golang.org/entry",
- Files: map[string]interface{}{
+ Files: map[string]any{
"x/x.go": `
package x
@@ -407,7 +407,7 @@
`}},
{
Name: "golang.org/cm...@v1.1.3",
- Files: map[string]interface{}{"c/c.go": `
+ Files: map[string]any{"c/c.go": `
package c
import (
@@ -445,7 +445,7 @@
},
{
Name: "golang.org/dm...@v0.5.0",
- Files: map[string]interface{}{"d/d.go": `
+ Files: map[string]any{"d/d.go": `
package d
import (
@@ -466,7 +466,7 @@
},
{
Name: "golang.org/am...@v1.1.3",
- Files: map[string]interface{}{"avuln/avuln.go": `
+ Files: map[string]any{"avuln/avuln.go": `
package avuln
type VulnData struct {}
@@ -476,7 +476,7 @@
},
{
Name: "golang.org/bm...@v0.5.0",
- Files: map[string]interface{}{"bvuln/bvuln.go": `
+ Files: map[string]any{"bvuln/bvuln.go": `
package bvuln
import (
@@ -490,7 +490,7 @@
},
{
Name: "golang.org/em...@v1.5.0",
- Files: map[string]interface{}{"e/e.go": `
+ Files: map[string]any{"e/e.go": `
package e
func E(f func()) {
@@ -559,7 +559,7 @@
e := packagestest.Export(t, packagestest.Modules, []packagestest.Module{
{
Name: "golang.org/entry",
- Files: map[string]interface{}{
+ Files: map[string]any{
"x/x.go": `
package x
@@ -572,7 +572,7 @@
},
{
Name: "golang.org/vm...@v1.2.3",
- Files: map[string]interface{}{"vuln/vuln.go": `
+ Files: map[string]any{"vuln/vuln.go": `
package vuln
func V() {}
@@ -646,7 +646,7 @@
e := packagestest.Export(t, packagestest.Modules, []packagestest.Module{
{
Name: "golang.org/entry",
- Files: map[string]interface{}{
+ Files: map[string]any{
"x/x.go": `
package x
@@ -659,7 +659,7 @@
},
{
Name: "golang.org/vm...@v1.2.3",
- Files: map[string]interface{}{"vuln/vuln.go": `
+ Files: map[string]any{"vuln/vuln.go": `
package vuln
func V1() {}
@@ -728,7 +728,7 @@
e := packagestest.Export(t, packagestest.Modules, []packagestest.Module{
{
Name: "golang.org/entry",
- Files: map[string]interface{}{
+ Files: map[string]any{
"x/x.go": `
package x
@@ -747,7 +747,7 @@
},
{
Name: "golang.org/am...@v1.1.3",
- Files: map[string]interface{}{"avuln/avuln.go": `
+ Files: map[string]any{"avuln/avuln.go": `
package avuln
type VulnData struct {}
@@ -810,7 +810,7 @@
e := packagestest.Export(t, packagestest.Modules, []packagestest.Module{
{
Name: "golang.org/entry",
- Files: map[string]interface{}{
+ Files: map[string]any{
"x/x.go": `
package x
@@ -833,7 +833,7 @@
},
{
Name: "golang.org/bm...@v0.5.0",
- Files: map[string]interface{}{"bvuln/bvuln.go": `
+ Files: map[string]any{"bvuln/bvuln.go": `
package bvuln
func Vuln() {}
@@ -871,7 +871,7 @@
e := packagestest.Export(t, packagestest.Modules, []packagestest.Module{
{
Name: "golang.org/entry",
- Files: map[string]interface{}{
+ Files: map[string]any{
"x/x.go": `
package x
@@ -892,7 +892,7 @@
},
{
Name: "golang.org/bm...@v0.5.0",
- Files: map[string]interface{}{"bvuln/bvuln.go": `
+ Files: map[string]any{"bvuln/bvuln.go": `
package bvuln
func Vuln() {}
diff --git a/internal/vulncheck/vulncheck_test.go b/internal/vulncheck/vulncheck_test.go
index b053c29..dd1b42f 100644
--- a/internal/vulncheck/vulncheck_test.go
+++ b/internal/vulncheck/vulncheck_test.go
@@ -410,7 +410,7 @@
e := packagestest.Export(t, packagestest.Modules, []packagestest.Module{
{
Name: "golang.org/entry",
- Files: map[string]interface{}{
+ Files: map[string]any{
"x/x.go": `
package x
@@ -418,13 +418,13 @@
`}},
{
Name: "golang.org/zm...@v0.0.0",
- Files: map[string]interface{}{"z/z.go": `
+ Files: map[string]any{"z/z.go": `
package z
`},
},
{
Name: "golang.org/am...@v1.1.3",
- Files: map[string]interface{}{"avuln/avuln.go": `
+ Files: map[string]any{"avuln/avuln.go": `
package avuln
import _ "golang.org/wmod/w"
@@ -432,13 +432,13 @@
},
{
Name: "golang.org/bm...@v0.5.0",
- Files: map[string]interface{}{"bvuln/bvuln.go": `
+ Files: map[string]any{"bvuln/bvuln.go": `
package bvuln
`},
},
{
Name: "golang.org/wm...@v0.0.0",
- Files: map[string]interface{}{"w/w.go": `
+ Files: map[string]any{"w/w.go": `
package w
import _ "golang.org/bmod/bvuln"
To view, visit change 490235. To unsubscribe, or for help writing mail filters, visit settings.
Oleksandr Redko (Gerrit)
May 18, 2023, 3:36:23 AM5/18/23
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Oleksandr Redko uploaded patch set #2 to this change.
all: replace 'interface{}' with 'any'
Change-Id: Icaa0540154dab452277d20b1e38430d89b3142e8
---
M internal/derrors/derrors.go
M internal/scan/source_test.go
M internal/vulncheck/binary_test.go
M internal/vulncheck/slicing_test.go
M internal/vulncheck/source_test.go
M internal/vulncheck/vulncheck_test.go
6 files changed, 33 insertions(+), 33 deletions(-)
To view, visit change 490235. To unsubscribe, or for help writing mail filters, visit settings.
Oleksandr Redko (Gerrit)
Jun 12, 2023, 7:09:32 AM6/12/23
to goph...@pubsubhelper.golang.org, golang-co...@googlegroups.com
Oleksandr Redko abandoned this change.
Abandoned
Moved to https://go-review.googlesource.com/c/vuln/+/502455
To view, visit change 490235. To unsubscribe, or for help writing mail filters, visit settings.
Reply all
Reply to author
Forward
0 new messages