mirror of
https://github.com/golang/go
synced 2024-11-19 14:54:43 -07:00
cmd/vet: warn on unkeyed struct pointer literals
We did warn on them in some cases, but not others. In particular, if one used a slice composite literal with struct pointer elements, and omitted the type of an element's composite literal, it would not get any warning even if it should get one. The issue is that typ.Underlying() can be of type *types.Pointer. Skip those levels of indirection before checking for a *types.Struct underlying type. isLocalType also needed a bit of tweaking to ignore dereferences. Perhaps that can be rewritten now that we have type info, but let's leave it for another time. Fixes #23539. Change-Id: I727a497284df1325b70d47a756519f5db1add25d Reviewed-on: https://go-review.googlesource.com/89715 Run-TryBot: Daniel Martí <mvdan@mvdan.cc> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
parent
8fea862f42
commit
6ded116ab1
@ -38,7 +38,15 @@ func checkUnkeyedLiteral(f *File, node ast.Node) {
|
||||
// skip whitelisted types
|
||||
return
|
||||
}
|
||||
if _, ok := typ.Underlying().(*types.Struct); !ok {
|
||||
under := typ.Underlying()
|
||||
for {
|
||||
ptr, ok := under.(*types.Pointer)
|
||||
if !ok {
|
||||
break
|
||||
}
|
||||
under = ptr.Elem().Underlying()
|
||||
}
|
||||
if _, ok := under.(*types.Struct); !ok {
|
||||
// skip non-struct composite literals
|
||||
return
|
||||
}
|
||||
@ -69,6 +77,10 @@ func isLocalType(f *File, typeName string) bool {
|
||||
return true
|
||||
}
|
||||
|
||||
// make *foo.bar, **foo.bar, etc match with the "foo." prefix
|
||||
// below
|
||||
typeName = strings.TrimLeft(typeName, "*")
|
||||
|
||||
pkgname := f.pkg.path
|
||||
if strings.HasPrefix(typeName, pkgname+".") {
|
||||
return true
|
||||
|
17
src/cmd/vet/testdata/composite.go
vendored
17
src/cmd/vet/testdata/composite.go
vendored
@ -62,6 +62,11 @@ var Okay6 = []MyStruct{
|
||||
{"aa", "bb", "cc"},
|
||||
}
|
||||
|
||||
var Okay7 = []*MyStruct{
|
||||
{"foo", "bar", "baz"},
|
||||
{"aa", "bb", "cc"},
|
||||
}
|
||||
|
||||
// Testing is awkward because we need to reference things from a separate package
|
||||
// to trigger the warnings.
|
||||
|
||||
@ -101,3 +106,15 @@ var whitelistedPoint = image.Point{1, 2}
|
||||
// Do not check type from unknown package.
|
||||
// See issue 15408.
|
||||
var unknownPkgVar = unknownpkg.Foobar{"foo", "bar"}
|
||||
|
||||
// A named pointer slice of CaseRange to test issue 23539. In
|
||||
// particular, we're interested in how some slice elements omit their
|
||||
// type.
|
||||
var goodNamedPointerSliceLiteral = []*unicode.CaseRange{
|
||||
{Lo: 1, Hi: 2},
|
||||
&unicode.CaseRange{Lo: 1, Hi: 2},
|
||||
}
|
||||
var badNamedPointerSliceLiteral = []*unicode.CaseRange{
|
||||
{1, 2}, // ERROR "unkeyed fields"
|
||||
&unicode.CaseRange{1, 2}, // ERROR "unkeyed fields"
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user