results: avoid stew in import name (#107)

Author: arnetheduck

json_serialization.nimble

@@ -18,7 +18,7 @@ skipDirs      = @["tests", "fuzzer"]
 
 requires "nim >= 1.6.0",
          "serialization",
-         "stew",
+         "stew >= 0.2.0",
          "results"
 
 let nimc = getEnv("NIMC", "nim") # Which nim compiler to use

json_serialization/pkg/results.nim

@@ -0,0 +1,38 @@
+# json-serialization
+# Copyright (c) 2019-2025 Status Research & Development GmbH
+# Licensed under either of
+#  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
+#  * MIT license ([LICENSE-MIT](LICENSE-MIT))
+# at your option.
+# This file may not be copied, modified, or distributed except according to
+# those terms.
+
+import
+  pkg/results, ../../json_serialization/[reader, writer, lexer]
+
+export
+  results
+
+template shouldWriteObjectField*[T](field: Result[T, void]): bool =
+  field.isOk
+
+proc writeValue*[T](
+    writer: var JsonWriter, value: Result[T, void]) {.raises: [IOError].} =
+  mixin writeValue
+
+  if value.isOk:
+    writer.writeValue value.get
+  else:
+    writer.writeValue JsonString("null")
+
+proc readValue*[T](reader: var JsonReader, value: var Result[T, void]) =
+  mixin readValue
+
+  if reader.tokKind == JsonValueKind.Null:
+    reset value
+    reader.parseNull()
+  else:
+    value.ok reader.readValue(T)
+
+func isFieldExpected*[T, E](_: type[Result[T, E]]): bool {.compileTime.} =
+  false

json_serialization/stew/results.nim

@@ -1,38 +1,13 @@
 # json-serialization
-# Copyright (c) 2019-2023 Status Research & Development GmbH
+# Copyright (c) 2019-2025 Status Research & Development GmbH
 # Licensed under either of
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
 #  * MIT license ([LICENSE-MIT](LICENSE-MIT))
 # at your option.
 # This file may not be copied, modified, or distributed except according to
 # those terms.
 
-import
-  pkg/results, ../../json_serialization/[reader, writer, lexer]
+{.deprecated: "json_serialization/pkg/results".}
 
-export
-  results
-
-template shouldWriteObjectField*[T](field: Result[T, void]): bool =
-  field.isOk
-
-proc writeValue*[T](
-    writer: var JsonWriter, value: Result[T, void]) {.raises: [IOError].} =
-  mixin writeValue
-
-  if value.isOk:
-    writer.writeValue value.get
-  else:
-    writer.writeValue JsonString("null")
-
-proc readValue*[T](reader: var JsonReader, value: var Result[T, void]) =
-  mixin readValue
-
-  if reader.tokKind == JsonValueKind.Null:
-    reset value
-    reader.parseNull()
-  else:
-    value.ok reader.readValue(T)
-
-func isFieldExpected*[T, E](_: type[Result[T, E]]): bool {.compileTime.} =
-  false
+import json_serialization/pkg/results
+export results

tests/test_json_flavor.nim

@@ -1,5 +1,5 @@
 # json-serialization
-# Copyright (c) 2019-2023 Status Research & Development GmbH
+# Copyright (c) 2019-2025 Status Research & Development GmbH
 # Licensed under either of
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
 #  * MIT license ([LICENSE-MIT](LICENSE-MIT))
@@ -12,7 +12,7 @@ import
   unittest2,
   results,
   serialization,
-  ../json_serialization/stew/results,
+  ../json_serialization/pkg/results,
   ../json_serialization/std/options,
   ../json_serialization
 

tests/test_serialization.nim

@@ -1,5 +1,5 @@
 # json-serialization
-# Copyright (c) 2019-2023 Status Research & Development GmbH
+# Copyright (c) 2019-2025 Status Research & Development GmbH
 # Licensed under either of
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
 #  * MIT license ([LICENSE-MIT](LICENSE-MIT))
@@ -14,7 +14,7 @@ import
   ../json_serialization, ./utils,
   ../json_serialization/lexer,
   ../json_serialization/std/[options, sets, tables],
-  ../json_serialization/stew/results
+  ../json_serialization/pkg/results
 
 type
   Foo = object

tests/test_writer.nim

@@ -1,5 +1,5 @@
 # json-serialization
-# Copyright (c) 2024 Status Research & Development GmbH
+# Copyright (c) 2024-2025 Status Research & Development GmbH
 # Licensed under either of
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
 #  * MIT license ([LICENSE-MIT](LICENSE-MIT))
@@ -9,7 +9,7 @@
 
 import
   unittest2,
-  ../json_serialization/stew/results,
+  ../json_serialization/pkg/results,
   ../json_serialization/std/options,
   ../json_serialization