From e6f9b4fb11285c5ceea3b3cc7cee26aa9f5ae3d2 Mon Sep 17 00:00:00 2001 From: Kevin Watters Date: Mon, 25 Mar 2019 09:23:46 -0400 Subject: Fix some -vet warnings; change import to core:math/bits --- core/encoding/json/marshal.odin | 2 +- core/encoding/json/tokenizer.odin | 4 ++-- core/encoding/json/types.odin | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'core/encoding/json') diff --git a/core/encoding/json/marshal.odin b/core/encoding/json/marshal.odin index d25758275..4f5ee6880 100644 --- a/core/encoding/json/marshal.odin +++ b/core/encoding/json/marshal.odin @@ -1,7 +1,7 @@ package json import "core:mem" -import "core:bits" +import "core:math/bits" import "core:runtime" import "core:strconv" import "core:strings" diff --git a/core/encoding/json/tokenizer.odin b/core/encoding/json/tokenizer.odin index dd1704ba7..f9da8437e 100644 --- a/core/encoding/json/tokenizer.odin +++ b/core/encoding/json/tokenizer.odin @@ -436,8 +436,8 @@ is_valid_string_literal :: proc(s: string, spec: Specification) -> bool { i += 5; for j := 0; j < 4; j += 1 { - c := hex[j]; - switch c { + c2 := hex[j]; + switch c2 { case '0'..'9', 'a'..'z', 'A'..'Z': // Okay case: diff --git a/core/encoding/json/types.odin b/core/encoding/json/types.odin index 6973d3dc5..036fe50b4 100644 --- a/core/encoding/json/types.odin +++ b/core/encoding/json/types.odin @@ -1,7 +1,5 @@ package json -import "core:strconv" - Specification :: enum { JSON, JSON5, -- cgit v1.2.3