From f64d55f7ff480ed13eca9c97c15450a2c4106078 Mon Sep 17 00:00:00 2001 From: jangko Date: Mon, 17 Apr 2023 08:06:09 +0700 Subject: [PATCH] fix missing annotation for nim 2.0 --- json_serialization/reader.nim | 7 ++- nimble.lock | 105 ---------------------------------- 2 files changed, 4 insertions(+), 108 deletions(-) delete mode 100644 nimble.lock diff --git a/json_serialization/reader.nim b/json_serialization/reader.nim index d04a895..6311f84 100644 --- a/json_serialization/reader.nim +++ b/json_serialization/reader.nim @@ -182,8 +182,9 @@ func maxAbsValue(T: type[SomeInteger]): uint64 {.compileTime.} = proc parseJsonNode(r: var JsonReader): JsonNode {.gcsafe, raises: [IOError, JsonReaderError, Defect].} -proc readJsonNodeField(r: var JsonReader, field: var JsonNode) = - if field != nil: +proc readJsonNodeField(r: var JsonReader, field: var JsonNode) + {.gcsafe, raises: [IOError, JsonReaderError, Defect].} = + if field.isNil.not: r.raiseUnexpectedValue("Unexpected duplicated field name") r.lexer.next() @@ -449,7 +450,7 @@ template isCharArray[N](v: array[N, char]): bool = true template isCharArray(v: auto): bool = false proc readValue*[T](r: var JsonReader, value: var T) - {.raises: [SerializationError, IOError, Defect].} = + {.gcsafe, raises: [SerializationError, IOError, Defect].} = ## Master filed/object parser. This function relies on customised sub-mixins for particular ## object types. ## diff --git a/nimble.lock b/nimble.lock deleted file mode 100644 index 6d48a98..0000000 --- a/nimble.lock +++ /dev/null @@ -1,105 +0,0 @@ -{ - "version": 1, - "packages": { - "unittest2": { - "version": "0.0.4", - "vcsRevision": "f180f596c88dfd266f746ed6f8dbebce39c824db", - "url": "https://github.com/status-im/nim-unittest2.git", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "fa309c41eaf6ef57895b9e603f2620a2f6e11780" - } - }, - "stew": { - "version": "0.1.0", - "vcsRevision": "6ad35b876fb6ebe0dfee0f697af173acc47906ee", - "url": "https://github.com/status-im/nim-stew.git", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "46d58c4feb457f3241e3347778334e325dce5268" - } - }, - "httputils": { - "version": "0.3.0", - "vcsRevision": "689da19e9e9cfff4ced85e2b25c6b2b5598ed079", - "url": "https://github.com/status-im/nim-http-utils.git", - "downloadMethod": "git", - "dependencies": [ - "stew" - ], - "checksums": { - "sha1": "4ad3ad68d13c50184180ab4b2eacc0bd7ed2ed44" - } - }, - "bearssl": { - "version": "0.1.5", - "vcsRevision": "ba80e2a0d7ae8aab666cee013e38ff8d33a3e5e7", - "url": "https://github.com/status-im/nim-bearssl", - "downloadMethod": "git", - "dependencies": [ - "unittest2" - ], - "checksums": { - "sha1": "383abd5becc77bf8e365b780a29d20529e1d9c4c" - } - }, - "chronos": { - "version": "3.0.11", - "vcsRevision": "17fed89c99beac5a92d3668d0d3e9b0e4ac13936", - "url": "https://github.com/status-im/nim-chronos.git", - "downloadMethod": "git", - "dependencies": [ - "stew", - "bearssl", - "httputils", - "unittest2" - ], - "checksums": { - "sha1": "f6fffc87571e5f76af2a77c4ebcc0e00909ced4e" - } - }, - "testutils": { - "version": "0.4.2", - "vcsRevision": "aa6e5216f4b4ab5aa971cdcdd70e1ec1203cedf2", - "url": "https://github.com/status-im/nim-testutils", - "downloadMethod": "git", - "dependencies": [ - "unittest2" - ], - "checksums": { - "sha1": "94427e0cce0e0c5841edcd3a6530b4e6b857a3cb" - } - }, - "faststreams": { - "version": "0.3.0", - "vcsRevision": "1b561a9e71b6bdad1c1cdff753418906037e9d09", - "url": "https://github.com/status-im/nim-faststreams.git", - "downloadMethod": "git", - "dependencies": [ - "stew", - "testutils", - "chronos", - "unittest2" - ], - "checksums": { - "sha1": "97edf9797924af48566a0af8267203dc21d80c77" - } - }, - "serialization": { - "version": "0.1.0", - "vcsRevision": "fcd0eadadde0ee000a63df8ab21dc4e9f015a790", - "url": "https://github.com/status-im/nim-serialization.git", - "downloadMethod": "git", - "dependencies": [ - "faststreams", - "unittest2", - "stew" - ], - "checksums": { - "sha1": "fef59519892cac70cccd81b612085caaa5e3e6cf" - } - } - } -} \ No newline at end of file