From b18444a6d03293b0cd45c452fd0a7e1532c48c85 Mon Sep 17 00:00:00 2001
From: Mark Spanbroek <mark@spanbroek.net>
Date: Mon, 5 Jun 2023 17:00:09 +0200
Subject: [PATCH] Support renamed 'results' library

---
 Readme.md                                        | 2 +-
 questionable.nimble                              | 2 +-
 questionable/resultsbase.nim                     | 4 ++--
 testmodules/{result => results}/nim.cfg          | 0
 testmodules/{result => results}/nimbledeps/.keep | 0
 testmodules/{result => results}/test.nim         | 0
 testmodules/{result => results}/test.nimble      | 2 +-
 testmodules/stew/test.nim                        | 2 +-
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename testmodules/{result => results}/nim.cfg (100%)
 rename testmodules/{result => results}/nimbledeps/.keep (100%)
 rename testmodules/{result => results}/test.nim (100%)
 rename testmodules/{result => results}/test.nimble (91%)

diff --git a/Readme.md b/Readme.md
index 7d49b8a..d5713ca 100644
--- a/Readme.md
+++ b/Readme.md
@@ -19,7 +19,7 @@ If you want to make use of Result types, then you also have to add either the
 [result][2] package, or the [stew][4] package:
 
 ```nim
-requires "result" # either this
+requires "results" # either this
 requires "stew"   # or this
 ```
 
diff --git a/questionable.nimble b/questionable.nimble
index 29a696b..0d168d8 100644
--- a/questionable.nimble
+++ b/questionable.nimble
@@ -4,7 +4,7 @@ description = "Elegant optional types"
 license = "MIT"
 
 task test, "Runs the test suite":
-  for module in ["options", "result", "stew"]:
+  for module in ["options", "results", "stew"]:
     withDir "testmodules/" & module:
       delEnv "NIMBLE_DIR" # use nimbledeps dir
       exec "nimble install -d -y"
diff --git a/questionable/resultsbase.nim b/questionable/resultsbase.nim
index 011050e..5f81356 100644
--- a/questionable/resultsbase.nim
+++ b/questionable/resultsbase.nim
@@ -1,7 +1,7 @@
 template tryImport(module) = import module
 
-when compiles tryImport pkg/result:
-  import pkg/result/../results
+when compiles tryImport pkg/results:
+  import pkg/results
 else:
   import pkg/stew/results
 
diff --git a/testmodules/result/nim.cfg b/testmodules/results/nim.cfg
similarity index 100%
rename from testmodules/result/nim.cfg
rename to testmodules/results/nim.cfg
diff --git a/testmodules/result/nimbledeps/.keep b/testmodules/results/nimbledeps/.keep
similarity index 100%
rename from testmodules/result/nimbledeps/.keep
rename to testmodules/results/nimbledeps/.keep
diff --git a/testmodules/result/test.nim b/testmodules/results/test.nim
similarity index 100%
rename from testmodules/result/test.nim
rename to testmodules/results/test.nim
diff --git a/testmodules/result/test.nimble b/testmodules/results/test.nimble
similarity index 91%
rename from testmodules/result/test.nimble
rename to testmodules/results/test.nimble
index 35a18bb..e8b9e58 100644
--- a/testmodules/result/test.nimble
+++ b/testmodules/results/test.nimble
@@ -3,7 +3,7 @@ author = "Questionable Authors"
 description = "Questionable tests for pkg/result"
 license = "MIT"
 
-requires "result"
+requires "results"
 
 task test, "Runs the test suite":
   exec "nim c -f -r --skipParentCfg test.nim"
diff --git a/testmodules/stew/test.nim b/testmodules/stew/test.nim
index ec17617..540f2f7 100644
--- a/testmodules/stew/test.nim
+++ b/testmodules/stew/test.nim
@@ -1 +1 @@
-include ../result/test
+include ../results/test