From 39302300d91e4875a2e2f475bb7938dfc86a5e20 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 3 May 2018 14:01:48 +0200 Subject: gometalinter: check unkeyed composite literals Update #538 --- pkg/compiler/types.go | 5 ++++- pkg/db/db.go | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'pkg') diff --git a/pkg/compiler/types.go b/pkg/compiler/types.go index c6be0d8f6..7c874130d 100644 --- a/pkg/compiler/types.go +++ b/pkg/compiler/types.go @@ -624,7 +624,10 @@ func init() { } typeStruct.Gen = func(comp *compiler, t *ast.Type, args []*ast.Type, base prog.IntTypeCommon) prog.Type { s := comp.structs[t.Ident] - key := prog.StructKey{t.Ident, base.ArgDir} + key := prog.StructKey{ + Name: t.Ident, + Dir: base.ArgDir, + } desc := comp.structDescs[key] if desc == nil { // Need to assign to structDescs before calling genStructDesc to break recursion. diff --git a/pkg/db/db.go b/pkg/db/db.go index 1e8eb9951..ab609c513 100644 --- a/pkg/db/db.go +++ b/pkg/db/db.go @@ -255,7 +255,7 @@ func deserializeRecord(r *bufio.Reader) (key string, val []byte, seq uint64, err return } if valLen != 0 { - fr := flate.NewReader(&io.LimitedReader{r, int64(valLen)}) + fr := flate.NewReader(&io.LimitedReader{R: r, N: int64(valLen)}) if val, err = ioutil.ReadAll(fr); err != nil { return } -- cgit mrf-deployment