From 1e59086680cc4c90cd7e9a2f5fcf98043df4396c Mon Sep 17 00:00:00 2001 From: Alan Donovan Date: Tue, 28 Jan 2025 12:49:59 -0500 Subject: [PATCH 1/2] message/pipeline: add two Unalias calls Change-Id: I692c027e2b97ee5509a63a2c88265759fc766800 Reviewed-on: https://go-review.googlesource.com/c/text/+/645016 Auto-Submit: Alan Donovan LUCI-TryBot-Result: Go LUCI Reviewed-by: Ian Lance Taylor --- message/pipeline/extract.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/message/pipeline/extract.go b/message/pipeline/extract.go index a15a7f9d3..23e58f021 100644 --- a/message/pipeline/extract.go +++ b/message/pipeline/extract.go @@ -148,13 +148,13 @@ func (x *extracter) processGlobalVars() { } t := a.Type() for { - p, ok := t.(*types.Pointer) + p, ok := types.Unalias(t).(*types.Pointer) if !ok { break } t = p.Elem() } - if b, ok := t.(*types.Basic); !ok || b.Kind() != types.String { + if b, ok := types.Unalias(t).(*types.Basic); !ok || b.Kind() != types.String { continue } x.visitInit(a, s.Val) From 3b64043c9e8fa8cd61a019df17dc729630915fa9 Mon Sep 17 00:00:00 2001 From: Gopher Robot Date: Tue, 4 Feb 2025 06:02:55 -0800 Subject: [PATCH 2/2] go.mod: update golang.org/x dependencies Update golang.org/x dependencies to their latest tagged versions. Change-Id: If969fddb3ff610170fae2ad6b797be516e98b0f4 Reviewed-on: https://go-review.googlesource.com/c/text/+/646475 Reviewed-by: Dmitri Shuralyov LUCI-TryBot-Result: Go LUCI Auto-Submit: Gopher Robot Reviewed-by: David Chase --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4025406bd..f421d92cc 100644 --- a/go.mod +++ b/go.mod @@ -6,4 +6,4 @@ require golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // tagx:ignore require golang.org/x/mod v0.17.0 // indirect; tagx:ignore -require golang.org/x/sync v0.10.0 // indirect +require golang.org/x/sync v0.11.0 // indirect diff --git a/go.sum b/go.sum index 053861cad..4370a6768 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=