diff --git a/core/encoding/json/marshal.odin b/core/encoding/json/marshal.odin index 784a814ca..35372e6f4 100644 --- a/core/encoding/json/marshal.odin +++ b/core/encoding/json/marshal.odin @@ -17,8 +17,6 @@ Marshal_Error :: union { io.Error, } - - marshal :: proc(v: any, allocator := context.allocator) -> (data: []byte, err: Marshal_Error) { b := strings.make_builder(allocator) defer if err != nil || data == nil { diff --git a/core/encoding/json/unmarshal.odin b/core/encoding/json/unmarshal.odin index d5d143d7f..6eb1d54f5 100644 --- a/core/encoding/json/unmarshal.odin +++ b/core/encoding/json/unmarshal.odin @@ -1,6 +1,5 @@ package json -import "core:fmt" import "core:mem" import "core:math" import "core:reflect" @@ -306,7 +305,7 @@ unmarsal_value :: proc(p: ^Parser, v: any) -> (err: Unmarshal_Error) { unmarsal_expect_token :: proc(p: ^Parser, kind: Token_Kind, loc := #caller_location) -> Token { prev := p.curr_token err := expect_token(p, kind) - fmt.assertf(condition = err == nil, fmt="unmarsal_expect_token: %v, got %v", args={kind, prev.kind}, loc=loc) + assert(err == nil, "unmarsal_expect_token") return prev }