Skip to content

Commit

Permalink
Use upstream github.com/go-json-experiment/json now that my PR was ac…
Browse files Browse the repository at this point in the history
…cepted
  • Loading branch information
veqryn committed Apr 13, 2024
1 parent f463e18 commit 1973389
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 12 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ import (
"log/slog"
"os"

"github.com/veqryn/json"
"github.com/veqryn/json/jsontext"
"github.com/go-json-experiment/json"
"github.com/go-json-experiment/json/jsontext"
slogjson "github.com/veqryn/slog-json"
)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ module github.com/veqryn/slog-json

go 1.21

require github.com/veqryn/json v0.1.0
require github.com/go-json-experiment/json v0.0.0-20240412061110-8868a69194fa
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github.com/veqryn/json v0.1.0 h1:/VRRuG8TKnyIzuBf2jw5rn9oFrzMNxqyv0BekvDyLWM=
github.com/veqryn/json v0.1.0/go.mod h1:d7xTdEVXlquK1eJxQic/C8+Jso+K/q7rR91kjlcdgYQ=
github.com/go-json-experiment/json v0.0.0-20240412061110-8868a69194fa h1:JUl7LfZewNlppx7w/82EwZ7d/N2nTXncAOeE55tI3Pk=
github.com/go-json-experiment/json v0.0.0-20240412061110-8868a69194fa/go.mod h1:6daplAwHHGbUGib4990V3Il26O0OC4aRyvewaaAihaA=
4 changes: 2 additions & 2 deletions handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"time"
"unicode/utf8"

"github.com/veqryn/json"
"github.com/veqryn/json/jsontext"
"github.com/go-json-experiment/json"
"github.com/go-json-experiment/json/jsontext"
"github.com/veqryn/slog-json/internal/buffer"
)

Expand Down
7 changes: 2 additions & 5 deletions handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"testing"
"time"

"github.com/veqryn/json"
"github.com/veqryn/json/jsontext"
"github.com/go-json-experiment/json"
"github.com/go-json-experiment/json/jsontext"
"github.com/veqryn/slog-json/internal/buffer"
)

Expand Down Expand Up @@ -694,13 +694,10 @@ func TestMoreFormatting(t *testing.T) {

overwrittenOpts := &HandlerOptions{
JSONOptions: json.JoinOptions(
defaultJSONOptions,
json.StringifyNumbers(true), // changed
jsontext.AllowDuplicateNames(false), // changed, should be overwritten later with true
jsontext.EscapeForHTML(true), // changed
jsontext.Multiline(true), // changed, should be overwritten later with false
jsontext.SpaceAfterColon(true), // changed, ignored by multiline true
jsontext.SpaceAfterComma(true), // ignored by multiline true
),
}

Expand Down

0 comments on commit 1973389

Please sign in to comment.