From e4ea94538f5b7d27f3dc7eeac23448f6358998eb Mon Sep 17 00:00:00 2001 From: Hasit Bhatt Date: Wed, 25 Sep 2019 20:58:27 +0000 Subject: [PATCH] go/analysis: fix vet errors Updating tools version in go fails the builds due to go vet errors as it can be observed in https://golang.org/cl/196843. Fix vet errors in facts.go and assign.go Updates golang/go#34062 Change-Id: I8e5a819a08d0bdc91c4fb21761065f026581bcd2 GitHub-Last-Rev: 57d832932859360d4668711ab6b46ac8cdd2e010 GitHub-Pull-Request: golang/tools#164 Reviewed-on: https://go-review.googlesource.com/c/tools/+/197338 Reviewed-by: Bryan C. Mills Run-TryBot: Bryan C. Mills --- go/analysis/internal/facts/facts.go | 4 ++-- go/analysis/passes/assign/assign.go | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go/analysis/internal/facts/facts.go b/go/analysis/internal/facts/facts.go index bcc6bd8e7d..07984521c3 100644 --- a/go/analysis/internal/facts/facts.go +++ b/go/analysis/internal/facts/facts.go @@ -103,7 +103,7 @@ func (s *Set) AllObjectFacts(filter map[reflect.Type]bool) []analysis.ObjectFact var facts []analysis.ObjectFact for k, v := range s.m { if k.obj != nil && filter[k.t] { - facts = append(facts, analysis.ObjectFact{k.obj, v}) + facts = append(facts, analysis.ObjectFact{Object: k.obj, Fact: v}) } } return facts @@ -136,7 +136,7 @@ func (s *Set) AllPackageFacts(filter map[reflect.Type]bool) []analysis.PackageFa var facts []analysis.PackageFact for k, v := range s.m { if k.obj == nil && filter[k.t] { - facts = append(facts, analysis.PackageFact{k.pkg, v}) + facts = append(facts, analysis.PackageFact{Package: k.pkg, Fact: v}) } } return facts diff --git a/go/analysis/passes/assign/assign.go b/go/analysis/passes/assign/assign.go index a9aefe52fe..3586638efc 100644 --- a/go/analysis/passes/assign/assign.go +++ b/go/analysis/passes/assign/assign.go @@ -63,7 +63,9 @@ func run(pass *analysis.Pass) (interface{}, error) { pass.Report(analysis.Diagnostic{ Pos: stmt.Pos(), Message: fmt.Sprintf("self-assignment of %s to %s", re, le), SuggestedFixes: []analysis.SuggestedFix{ - {Message: "Remove", TextEdits: []analysis.TextEdit{{stmt.Pos(), stmt.End(), []byte{}}}}, + {Message: "Remove", TextEdits: []analysis.TextEdit{ + {Pos: stmt.Pos(), End: stmt.End(), NewText: []byte{}}, + }}, }, }) }