aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/vendor/github.com
diff options
context:
space:
mode:
authorBryan C. Mills <bcmills@google.com>2022-05-17 16:26:49 -0400
committerGopher Robot <gobot@golang.org>2022-05-17 20:59:58 +0000
commit89533024b011bcf41d6de295a5dfb1ad73486abf (patch)
tree6bab63f61b81c07b0ddf0edfa6255217e20c33ff /src/cmd/vendor/github.com
parentb2ae2f5358e87fabd519bc2de20b3ab81d733820 (diff)
downloadgo-89533024b011bcf41d6de295a5dfb1ad73486abf.tar.xz
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>
Diffstat (limited to 'src/cmd/vendor/github.com')
-rw-r--r--src/cmd/vendor/github.com/ianlancetaylor/demangle/demangle.go2
1 files changed, 1 insertions, 1 deletions
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