From 8a9de1b095ae54649c1dc503f4f718779bddb55f Mon Sep 17 00:00:00 2001 From: "Hana (Hyang-Ah) Kim" Date: Thu, 8 Sep 2022 10:46:37 -0400 Subject: [PATCH] [gopls-release-branch.0.9] gopls: use golang.org/x/tools@ce397412b6a4 That includes the fix reviewed in https://go.dev/cl/429515 Remove the replace statement again for release. For golang/go#54842 Change-Id: I80e9f98eadff82eee7d6d82b8a6a4c30ee108ac7 Reviewed-on: https://go-review.googlesource.com/c/tools/+/429516 Run-TryBot: Hyang-Ah Hana Kim TryBot-Result: Gopher Robot Reviewed-by: Robert Findley gopls-CI: kokoro --- gopls/go.mod | 4 +--- gopls/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gopls/go.mod b/gopls/go.mod index 67e514aebc7..3c2b237820b 100644 --- a/gopls/go.mod +++ b/gopls/go.mod @@ -9,7 +9,7 @@ require ( github.com/sergi/go-diff v1.1.0 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f - golang.org/x/tools v0.1.13-0.20220906175253-093c8a713e3d + golang.org/x/tools v0.1.13-0.20220908144252-ce397412b6a4 golang.org/x/vuln v0.0.0-20220901221904-62b0186a1058 honnef.co/go/tools v0.3.2 mvdan.cc/gofumpt v0.3.1 @@ -25,5 +25,3 @@ require ( golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 golang.org/x/text v0.3.7 // indirect ) - -replace golang.org/x/tools => ../ \ No newline at end of file diff --git a/gopls/go.sum b/gopls/go.sum index 47a5f6ec269..ccaca2c1415 100644 --- a/gopls/go.sum +++ b/gopls/go.sum @@ -95,8 +95,8 @@ golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.11-0.20220513221640-090b14e8501f/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.1.13-0.20220906175253-093c8a713e3d h1:8oFmUXw+2noyjlB8YKgjSRK0PSzxE4ZSJe4WPRaG3g0= -golang.org/x/tools v0.1.13-0.20220906175253-093c8a713e3d/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.1.13-0.20220908144252-ce397412b6a4 h1:glzimF7qHZuKVEiMbE7UqBu44MyTjt5u6j3Jz+rfMRM= +golang.org/x/tools v0.1.13-0.20220908144252-ce397412b6a4/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/vuln v0.0.0-20220901221904-62b0186a1058 h1:YnB27EXBD8XxB0JcaOeluuvhF2kS4DrH0k+lpopG2xc= golang.org/x/vuln v0.0.0-20220901221904-62b0186a1058/go.mod h1:7tDfEDtOLlzHQRi4Yzfg5seVBSvouUIjyPzBx4q5CxQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=