commit e4ea94538f5b7d27f3dc7eeac23448f6358998eb
author Hasit Bhatt <hasit.p.bhatt@gmail.com> Wed Sep 25 20:58:27 2019 +0000
committer Bryan C. Mills <bcmills@google.com> Wed Sep 25 21:18:24 2019 +0000
tree 241d627dd4289d501d9be70a1bccc5b52cfed086
parent 2e68ad74ea7fea8e1e2c172cb58407eacc2228eb

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 <bcmills@google.com>
Run-TryBot: Bryan C. Mills <bcmills@google.com>

go/analysis/internal/facts/facts.go

diff --git a/go/analysis/internal/facts/facts.go b/go/analysis/internal/facts/facts.go
index bcc6bd8..0798452 100644
--- a/go/analysis/internal/facts/facts.go
+++ b/go/analysis/internal/facts/facts.go
@@ -103,7 +103,7 @@
 	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 @@
 	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

go/analysis/passes/assign/assign.go

diff --git a/go/analysis/passes/assign/assign.go b/go/analysis/passes/assign/assign.go
index a9aefe5..3586638 100644
--- a/go/analysis/passes/assign/assign.go
+++ b/go/analysis/passes/assign/assign.go
@@ -63,7 +63,9 @@
 				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{}},
+						}},
 					},
 				})
 			}