From: Philip Børgesen <PhilipBorgesen@users.noreply.github.com>
Date: Tue, 21 Aug 2018 00:52:46 +0000 (+0000)
Subject: encoding/json: eliminate superfluous space in Decoder.Token error messages
X-Git-Tag: go1.12beta1~1402
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=97c7e0e0ad1be5c4d211e0182ff970a2086e7679;p=gostls13.git

encoding/json: eliminate superfluous space in Decoder.Token error messages

The existing Decoder.tokenError implementation creates its error messages by
concatenating "invalid character " + quoteChar(c) + " " + context. All context
values however already start with a space leading to error messages containing
two spaces.

This change removes " " from the concatenation expression.

Fixes #26587

Change-Id: I93d14319396636b2a40d55053bda88c98e94a81a
GitHub-Last-Rev: 6db7e1991b15beee601f558be72a2737070d8f68
GitHub-Pull-Request: golang/go#26588
Reviewed-on: https://go-review.googlesource.com/125775
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/encoding/json/stream.go b/src/encoding/json/stream.go
index 75a4270df7..63aa030955 100644
--- a/src/encoding/json/stream.go
+++ b/src/encoding/json/stream.go
@@ -471,7 +471,7 @@ func (dec *Decoder) tokenError(c byte) (Token, error) {
 	case tokenObjectComma:
 		context = " after object key:value pair"
 	}
-	return nil, &SyntaxError{"invalid character " + quoteChar(c) + " " + context, dec.offset()}
+	return nil, &SyntaxError{"invalid character " + quoteChar(c) + context, dec.offset()}
 }
 
 // More reports whether there is another element in the