1
0
mirror of https://github.com/golang/go synced 2024-09-29 12:14:28 -06:00

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 <gobot@golang.org>
Run-TryBot: Bryan Mills <bcmills@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Auto-Submit: Bryan Mills <bcmills@google.com>
This commit is contained in:
Bryan C. Mills 2022-05-17 16:26:49 -04:00 committed by Gopher Robot
parent b2ae2f5358
commit 89533024b0

View File

@ -1715,7 +1715,7 @@ func (st *state) demangleCastTemplateArgs(tp AST, addSubst bool) AST {
return tp return tp
} }
// mergeQualifiers merges two qualifier lists into one. // mergeQualifiers merges two qualifer lists into one.
func mergeQualifiers(q1AST, q2AST AST) AST { func mergeQualifiers(q1AST, q2AST AST) AST {
if q1AST == nil { if q1AST == nil {
return q2AST return q2AST