diff options
| author | zeripath <art27@cantab.net> | 2021-03-01 21:08:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-01 22:08:10 +0100 |
| commit | f0e15250b9e322cc7731ba026d12387c2b549a42 (patch) | |
| tree | f13d46119077ba924d620ef172b91daa315bda0a /services/gitdiff | |
| parent | 59fd641d1fb021e35aea7f9f4a1916cc11ef5c51 (diff) | |
| download | gitea-f0e15250b9e322cc7731ba026d12387c2b549a42.tar.gz gitea-f0e15250b9e322cc7731ba026d12387c2b549a42.zip | |
Migrate to use jsoniter instead of encoding/json (#14841)
* Migrate to use jsoniter
* fix tests
* update gitea.com/go-chi/binding
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: 6543 <6543@obermui.de>
Diffstat (limited to 'services/gitdiff')
| -rw-r--r-- | services/gitdiff/gitdiff_test.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/gitdiff/gitdiff_test.go b/services/gitdiff/gitdiff_test.go index 2f92a01694..f8c25a3912 100644 --- a/services/gitdiff/gitdiff_test.go +++ b/services/gitdiff/gitdiff_test.go @@ -6,7 +6,6 @@ package gitdiff import ( - "encoding/json" "fmt" "html/template" "strconv" @@ -17,6 +16,7 @@ import ( "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/highlight" "code.gitea.io/gitea/modules/setting" + jsoniter "github.com/json-iterator/go" dmp "github.com/sergi/go-diff/diffmatchpatch" "github.com/stretchr/testify/assert" "gopkg.in/ini.v1" @@ -298,7 +298,8 @@ index 6961180..9ba1a00 100644 t.Errorf("ParsePatch(%q) error = %v, wantErr %v", testcase.name, err, testcase.wantErr) return } - gotMarshaled, _ := json.MarshalIndent(got, " ", " ") + json := jsoniter.ConfigCompatibleWithStandardLibrary + gotMarshaled, _ := json.MarshalIndent(got, "", " ") if got.NumFiles != 1 { t.Errorf("ParsePath(%q) did not receive 1 file:\n%s", testcase.name, string(gotMarshaled)) return |