all: merge master (43c41b5) into gopls-release-branch.0.14
For golang/go#63220
Merge List:
+ 2023-10-16 43c41b5e5 internal/refactor/inline: reify implicit return conversions
Change-Id: Ie2beb052f316efb38d52f7a35557f7c580c19da7
diff --git a/codereview.cfg b/codereview.cfg
index 3f8b14b..49d667a 100644
--- a/codereview.cfg
+++ b/codereview.cfg
@@ -1 +1,3 @@
issuerepo: golang/go
+branch: gopls-release-branch.0.14
+parent-branch: master
diff --git a/gopls/go.mod b/gopls/go.mod
index 051e7f8..7312a0b 100644
--- a/gopls/go.mod
+++ b/gopls/go.mod
@@ -12,7 +12,7 @@
golang.org/x/sys v0.13.0
golang.org/x/telemetry v0.0.0-20231011160506-788d5629a052
golang.org/x/text v0.13.0
- golang.org/x/tools v0.13.1-0.20230920233436-f9b8da7b22be
+ golang.org/x/tools v0.14.1-0.20231011191651-895b4eda3179
golang.org/x/vuln v1.0.1
gopkg.in/yaml.v3 v3.0.1
honnef.co/go/tools v0.4.5
diff --git a/gopls/go.sum b/gopls/go.sum
index e22f5e5..0b35591 100644
--- a/gopls/go.sum
+++ b/gopls/go.sum
@@ -44,8 +44,6 @@
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/telemetry v0.0.0-20231003223302-0168ef4ebbd3 h1:vxxQvncMbcRAtqHV5HsHGJkbya+BIOYIY+y6cdPZhzk=
-golang.org/x/telemetry v0.0.0-20231003223302-0168ef4ebbd3/go.mod h1:ppZ76JTkRgJC2GQEgtVY3fiuJR+N8FU2MAlp+gfN1E4=
golang.org/x/telemetry v0.0.0-20231011160506-788d5629a052 h1:1baVNneD/IRxmu8JQdBuki78zUqBtZxq8smZXQj0X2Y=
golang.org/x/telemetry v0.0.0-20231011160506-788d5629a052/go.mod h1:6p4ScoNeC2dhpQ1nSSMmkZ7mEj5JQUSCyc0uExBp5T4=
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
