From 92f7f7e6c5d473983057b40e2b0fd91aaddfa648 Mon Sep 17 00:00:00 2001 From: Eric <5089238+emizzle@users.noreply.github.com> Date: Wed, 7 Feb 2024 14:44:13 +1100 Subject: [PATCH] Move modules into json folder, to make way for other types of serde --- serde.nim | 14 ++------------ serde/json.nim | 13 +++++++++++++ serde/{ => json}/common.nim | 0 serde/{ => json}/deserializer.nim | 0 serde/{ => json}/errors.nim | 0 serde/{ => json}/pragmas.nim | 0 serde/{ => json}/serializer.nim | 0 serde/{ => json}/stdjson.nim | 0 serde/{ => json}/types.nim | 0 tests/{ => json}/testDeserialize.nim | 0 tests/{ => json}/testDeserializeModes.nim | 0 tests/{ => json}/testPragmas.nim | 0 tests/{ => json}/testSerialize.nim | 2 +- tests/{ => json}/testSerializeModes.nim | 0 tests/test.nim | 10 +++++----- 15 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 serde/json.nim rename serde/{ => json}/common.nim (100%) rename serde/{ => json}/deserializer.nim (100%) rename serde/{ => json}/errors.nim (100%) rename serde/{ => json}/pragmas.nim (100%) rename serde/{ => json}/serializer.nim (100%) rename serde/{ => json}/stdjson.nim (100%) rename serde/{ => json}/types.nim (100%) rename tests/{ => json}/testDeserialize.nim (100%) rename tests/{ => json}/testDeserializeModes.nim (100%) rename tests/{ => json}/testPragmas.nim (100%) rename tests/{ => json}/testSerialize.nim (99%) rename tests/{ => json}/testSerializeModes.nim (100%) diff --git a/serde.nim b/serde.nim index 5579b8b..db31316 100644 --- a/serde.nim +++ b/serde.nim @@ -1,13 +1,3 @@ -import ./serde/common -import ./serde/deserializer -import ./serde/stdjson -import ./serde/pragmas -import ./serde/serializer -import ./serde/types +import ./serde/json -export common -export deserializer -export stdjson -export pragmas -export serializer -export types +export json diff --git a/serde/json.nim b/serde/json.nim new file mode 100644 index 0000000..bd0a738 --- /dev/null +++ b/serde/json.nim @@ -0,0 +1,13 @@ +import ./json/common +import ./json/deserializer +import ./json/stdjson +import ./json/pragmas +import ./json/serializer +import ./json/types + +export common +export deserializer +export stdjson +export pragmas +export serializer +export types \ No newline at end of file diff --git a/serde/common.nim b/serde/json/common.nim similarity index 100% rename from serde/common.nim rename to serde/json/common.nim diff --git a/serde/deserializer.nim b/serde/json/deserializer.nim similarity index 100% rename from serde/deserializer.nim rename to serde/json/deserializer.nim diff --git a/serde/errors.nim b/serde/json/errors.nim similarity index 100% rename from serde/errors.nim rename to serde/json/errors.nim diff --git a/serde/pragmas.nim b/serde/json/pragmas.nim similarity index 100% rename from serde/pragmas.nim rename to serde/json/pragmas.nim diff --git a/serde/serializer.nim b/serde/json/serializer.nim similarity index 100% rename from serde/serializer.nim rename to serde/json/serializer.nim diff --git a/serde/stdjson.nim b/serde/json/stdjson.nim similarity index 100% rename from serde/stdjson.nim rename to serde/json/stdjson.nim diff --git a/serde/types.nim b/serde/json/types.nim similarity index 100% rename from serde/types.nim rename to serde/json/types.nim diff --git a/tests/testDeserialize.nim b/tests/json/testDeserialize.nim similarity index 100% rename from tests/testDeserialize.nim rename to tests/json/testDeserialize.nim diff --git a/tests/testDeserializeModes.nim b/tests/json/testDeserializeModes.nim similarity index 100% rename from tests/testDeserializeModes.nim rename to tests/json/testDeserializeModes.nim diff --git a/tests/testPragmas.nim b/tests/json/testPragmas.nim similarity index 100% rename from tests/testPragmas.nim rename to tests/json/testPragmas.nim diff --git a/tests/testSerialize.nim b/tests/json/testSerialize.nim similarity index 99% rename from tests/testSerialize.nim rename to tests/json/testSerialize.nim index 5d130bd..a97c895 100644 --- a/tests/testSerialize.nim +++ b/tests/json/testSerialize.nim @@ -5,7 +5,7 @@ import pkg/stint import pkg/serde import pkg/questionable -import ./helpers +import ../helpers suite "json serialization - serialize": diff --git a/tests/testSerializeModes.nim b/tests/json/testSerializeModes.nim similarity index 100% rename from tests/testSerializeModes.nim rename to tests/json/testSerializeModes.nim diff --git a/tests/test.nim b/tests/test.nim index 0707642..760b01b 100644 --- a/tests/test.nim +++ b/tests/test.nim @@ -1,7 +1,7 @@ -import ./testPragmas -import ./testSerialize -import ./testSerializeModes -import ./testDeserialize -import ./testDeserializeModes +import ./json/testDeserialize +import ./json/testDeserializeModes +import ./json/testPragmas +import ./json/testSerialize +import ./json/testSerializeModes {.warning[UnusedImport]:off.}