From 361948499bfbdc51d2eedc9e15f5ad44373abc7a Mon Sep 17 00:00:00 2001 From: Nickolay Bukreyev Date: Sun, 3 Apr 2022 09:08:32 +0700 Subject: [PATCH] Fix deprecation warning when importing `errorban` inside the library `errorban` module [has been deprecated][deprecation] since v0.5.0. The library continued to use it internally, but because of that, it was triggering its own deprecation warning. This commit splits `errorban.nim` into two pieces: the warning and actual code. [deprecation]: https://github.com/status-im/questionable/commit/e66cd2439b --- questionable/errorban.nim | 9 +-------- questionable/options.nim | 2 +- questionable/private/errorban.nim | 8 ++++++++ questionable/results.nim | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 questionable/private/errorban.nim diff --git a/questionable/errorban.nim b/questionable/errorban.nim index 9e2ec2b..d92d172 100644 --- a/questionable/errorban.nim +++ b/questionable/errorban.nim @@ -1,10 +1,3 @@ {.warning: "errorban is deprecated; use nimble package `upraises` instead".} -## Include this file to indicate that your module does not raise Errors. -## Disables compiler hints about unused declarations in Nim < 1.4.0 - -when (NimMajor, NimMinor, NimPatch) >= (1, 4, 0): - {.push raises:[].} -else: - {.push raises: [Defect].} - {.hint[XDeclaredButNotUsed]: off.} +include ./private/errorban diff --git a/questionable/options.nim b/questionable/options.nim index f0d83ea..c4e4dc4 100644 --- a/questionable/options.nim +++ b/questionable/options.nim @@ -6,7 +6,7 @@ import ./indexing import ./operators import ./without -include ./errorban +include ./private/errorban export options except get export binding diff --git a/questionable/private/errorban.nim b/questionable/private/errorban.nim new file mode 100644 index 0000000..d2becfc --- /dev/null +++ b/questionable/private/errorban.nim @@ -0,0 +1,8 @@ +## Include this file to indicate that your module does not raise Errors. +## Disables compiler hints about unused declarations in Nim < 1.4.0 + +when (NimMajor, NimMinor, NimPatch) >= (1, 4, 0): + {.push raises:[].} +else: + {.push raises: [Defect].} + {.hint[XDeclaredButNotUsed]: off.} diff --git a/questionable/results.nim b/questionable/results.nim index e086ad6..b15c8ab 100644 --- a/questionable/results.nim +++ b/questionable/results.nim @@ -8,7 +8,7 @@ import ./operators import ./without import ./withoutresult -include ./errorban +include ./private/errorban export resultsbase except ok, err, isOk, isErr, get export binding