diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0c25b54..672cf3d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - nim: [stable, 1.4.8, 1.2.6] + nim: [stable, 1.4.8, 1.2.18] steps: - uses: actions/checkout@v2 - uses: iffy/install-nim@v3 diff --git a/config.nims b/config.nims index 7c9db32..7e2fa23 100644 --- a/config.nims +++ b/config.nims @@ -1,3 +1,9 @@ +--styleCheck:usages +if (NimMajor, NimMinor) < (1, 6): + --styleCheck:hint +else: + --styleCheck:error + # begin Nimble config (version 1) when fileExists("nimble.paths"): include "nimble.paths" diff --git a/questionable/private/binderror.nim b/questionable/private/binderror.nim index bf23195..372f256 100644 --- a/questionable/private/binderror.nim +++ b/questionable/private/binderror.nim @@ -1,6 +1,6 @@ import std/options -var captureEnabled {.global, compiletime.}: bool +var captureEnabled {.global, compileTime.}: bool var errorVariable: ptr ref CatchableError template captureBindError*(error: var ref CatchableError, expression): auto = diff --git a/questionable/resultsbase.nim b/questionable/resultsbase.nim index c8383df..011050e 100644 --- a/questionable/resultsbase.nim +++ b/questionable/resultsbase.nim @@ -1,6 +1,6 @@ template tryImport(module) = import module -when compiles tryimport pkg/result: +when compiles tryImport pkg/result: import pkg/result/../results else: import pkg/stew/results