aboutsummaryrefslogtreecommitdiff
path: root/core/encoding/json
diff options
context:
space:
mode:
authorKevin Watters <kevinwatters@gmail.com>2019-03-25 09:23:46 -0400
committerKevin Watters <kevinwatters@gmail.com>2019-03-25 09:23:46 -0400
commite6f9b4fb11285c5ceea3b3cc7cee26aa9f5ae3d2 (patch)
treef7727e60f800c094f643336ee00e82b7dbc2b90d /core/encoding/json
parentb978959fae1c7449f24706fb3e33630b617a73f0 (diff)
Fix some -vet warnings; change import to core:math/bits
Diffstat (limited to 'core/encoding/json')
-rw-r--r--core/encoding/json/marshal.odin2
-rw-r--r--core/encoding/json/tokenizer.odin4
-rw-r--r--core/encoding/json/types.odin2
3 files changed, 3 insertions, 5 deletions
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,