From 89533024b011bcf41d6de295a5dfb1ad73486abf Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Tue, 17 May 2022 16:26:49 -0400 Subject: [PATCH] vendor: revert stray edit from CL 406835 In reviewing CL 406835, I missed that one of the edited files was in src/vendor. This change reverts that file, fixing the failing moddeps test on the longtest builders. Change-Id: Id04b45c3379cf6c17b333444eb7be1301ffcb5f1 Reviewed-on: https://go-review.googlesource.com/c/go/+/406895 TryBot-Result: Gopher Robot Run-TryBot: Bryan Mills Reviewed-by: Ian Lance Taylor Auto-Submit: Bryan Mills --- src/cmd/vendor/github.com/ianlancetaylor/demangle/demangle.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/vendor/github.com/ianlancetaylor/demangle/demangle.go b/src/cmd/vendor/github.com/ianlancetaylor/demangle/demangle.go index af5134deb9..66ac7dde62 100644 --- a/src/cmd/vendor/github.com/ianlancetaylor/demangle/demangle.go +++ b/src/cmd/vendor/github.com/ianlancetaylor/demangle/demangle.go @@ -1715,7 +1715,7 @@ func (st *state) demangleCastTemplateArgs(tp AST, addSubst bool) AST { return tp } -// mergeQualifiers merges two qualifier lists into one. +// mergeQualifiers merges two qualifer lists into one. func mergeQualifiers(q1AST, q2AST AST) AST { if q1AST == nil { return q2AST