aboutsummaryrefslogtreecommitdiff
path: root/src/html
diff options
context:
space:
mode:
authorKevin Burke <kev@inburke.com>2020-11-27 13:55:27 -0800
committerJoe Tsai <thebrokentoaster@gmail.com>2020-12-01 22:51:45 +0000
commit283d65413db75edbc4691c4fecf23228509436f0 (patch)
tree4831d9aa2c2bde40021a296201a0f8502ed4617c /src/html
parent7fca39aa05ad3c60abac1ae51ae9847dfbe017d6 (diff)
downloadgo-283d65413db75edbc4691c4fecf23228509436f0.tar.gz
go-283d65413db75edbc4691c4fecf23228509436f0.zip
encoding/json: revert "add "json: " prefix to SyntaxError messages"
This reverts commit 6af088bfc66c13143c9ef46b4cf0805df77a8fbe. Reason for revert: Broke many tests inside Google which implies many tests were broken outside of Google as well. The tests may be brittle but still would require work to change and it's not clear it's worth the benefit. Updates #36221 Fixes #42675 Change-Id: Id3a14eb37e7119f5abe50e80dfbf120fdc44db72 Reviewed-on: https://go-review.googlesource.com/c/go/+/273747 Run-TryBot: Joe Tsai <thebrokentoaster@gmail.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Russ Cox <rsc@golang.org> Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com> Trust: Joe Tsai <thebrokentoaster@gmail.com>
Diffstat (limited to 'src/html')
-rw-r--r--src/html/template/escape_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/html/template/escape_test.go b/src/html/template/escape_test.go
index b6031ea60a..fbc84a7592 100644
--- a/src/html/template/escape_test.go
+++ b/src/html/template/escape_test.go
@@ -243,7 +243,7 @@ func TestEscape(t *testing.T) {
{
"badMarshaler",
`<button onclick='alert(1/{{.B}}in numbers)'>`,
- `<button onclick='alert(1/ /* json: error calling MarshalJSON for type *template.badMarshaler: json: invalid character &#39;f&#39; looking for beginning of object key string */null in numbers)'>`,
+ `<button onclick='alert(1/ /* json: error calling MarshalJSON for type *template.badMarshaler: invalid character &#39;f&#39; looking for beginning of object key string */null in numbers)'>`,
},
{
"jsMarshaler",