diff --git a/leopard.nimble b/leopard.nimble index 3f4b744..272b777 100644 --- a/leopard.nimble +++ b/leopard.nimble @@ -8,6 +8,5 @@ license = "Apache License 2.0 or MIT" installDirs = @["vendor"] requires "nim >= 1.6.0", - "stew", - "unittest2", - "upraises >= 0.1.0 & < 0.2.0" + "results", + "unittest2" diff --git a/leopard/leopard.nim b/leopard/leopard.nim index 5cc7390..b794398 100644 --- a/leopard/leopard.nim +++ b/leopard/leopard.nim @@ -7,12 +7,11 @@ ## This file may not be copied, modified, or distributed except according to ## those terms. -import pkg/upraises -push: {.upraises: [].} +{.push raises: [].} {.deadCodeElim: on.} -import pkg/stew/results +import pkg/results import ./wrapper import ./utils diff --git a/leopard/utils/allocs.nim b/leopard/utils/allocs.nim index 559b461..96eb36d 100644 --- a/leopard/utils/allocs.nim +++ b/leopard/utils/allocs.nim @@ -7,9 +7,7 @@ ## This file may not be copied, modified, or distributed except according to ## those terms. -import pkg/upraises -push: - {.upraises: [].} +{.push raises: [].} {.deadCodeElim: on.} diff --git a/leopard/utils/cpuinfo_x86.nim b/leopard/utils/cpuinfo_x86.nim index dc0add7..293d521 100644 --- a/leopard/utils/cpuinfo_x86.nim +++ b/leopard/utils/cpuinfo_x86.nim @@ -7,8 +7,7 @@ ## This file may not be copied, modified, or distributed except according to ## those terms. -import pkg/upraises -push: {.upraises: [].} +{.push raises: [].} {.deadCodeElim: on.} diff --git a/leopard/wrapper.nim b/leopard/wrapper.nim index c90eeb7..258b255 100644 --- a/leopard/wrapper.nim +++ b/leopard/wrapper.nim @@ -55,9 +55,7 @@ ## arithmetic using Intel SIMD instructions." In: FAST-2013: 11th Usenix ## Conference on File and Storage Technologies, San Jose, 2013 -import pkg/upraises -push: - {.upraises: [].} +{.push raises: [].} ## ----------------------------------------------------------------------------- ## Build configuration diff --git a/nimble.lock b/nimble.lock index b079b94..4ff3320 100644 --- a/nimble.lock +++ b/nimble.lock @@ -1,35 +1,26 @@ { - "version": 1, + "version": 2, "packages": { + "results": { + "version": "0.5.1", + "vcsRevision": "df8113dda4c2d74d460a8fa98252b0b771bf1f27", + "url": "https://github.com/arnetheduck/nim-results", + "downloadMethod": "git", + "dependencies": [], + "checksums": { + "sha1": "a9c011f74bc9ed5c91103917b9f382b12e82a9e7" + } + }, "unittest2": { - "version": "0.0.4", - "vcsRevision": "f180f596c88dfd266f746ed6f8dbebce39c824db", - "url": "https://github.com/status-im/nim-unittest2.git", + "version": "0.2.4", + "vcsRevision": "8b51e99b4a57fcfb31689230e75595f024543024", + "url": "https://github.com/status-im/nim-unittest2", "downloadMethod": "git", "dependencies": [], "checksums": { - "sha1": "fa309c41eaf6ef57895b9e603f2620a2f6e11780" - } - }, - "upraises": { - "version": "0.1.0", - "vcsRevision": "ff4f8108e44fba9b35cac535ab63d3927e8fd3c2", - "url": "https://github.com/markspanbroek/upraises.git", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "a0243c8039e12d547dbb2e9c73789c16bb8bc956" - } - }, - "stew": { - "version": "0.1.0", - "vcsRevision": "6ad35b876fb6ebe0dfee0f697af173acc47906ee", - "url": "https://github.com/status-im/nim-stew.git", - "downloadMethod": "git", - "dependencies": [], - "checksums": { - "sha1": "46d58c4feb457f3241e3347778334e325dce5268" + "sha1": "746106a4dfefffce497f1693733f1c1513b5c62c" } } - } -} \ No newline at end of file + }, + "tasks": {} +} diff --git a/tests/helpers.nim b/tests/helpers.nim index a9a11e6..e5a47f2 100644 --- a/tests/helpers.nim +++ b/tests/helpers.nim @@ -1,6 +1,6 @@ import std/random -import pkg/stew/results +import pkg/results import ../leopard proc randomCRCPacket*(data: var openArray[byte]) = diff --git a/tests/testleopard.nim b/tests/testleopard.nim index 68894de..760706e 100644 --- a/tests/testleopard.nim +++ b/tests/testleopard.nim @@ -2,7 +2,7 @@ import std/random import std/sets import pkg/unittest2 -import pkg/stew/results +import pkg/results import ../leopard import ./helpers