Add TOML feature (#75)

Adds rustg_read_toml_file, which takes a filepath and spits out the output after decoding (a list, probably).

Uses the rust-toml lib

Cargo.toml

@@ -42,9 +42,10 @@ dashmap = { version = "4.0", optional = true }
 zip = { version = "0.5.8", optional = true }
 rand = {version = "0.8", optional = true}
 dmsort = {version = "1.0.0", optional = true}
+toml-dep = { version = "0.5.8", package="toml", optional = true }
 
 [features]
-default = ["cellularnoise", "dmi", "file", "git", "http", "json", "log", "noise", "sql", "url"]
+default = ["cellularnoise", "dmi", "file", "git", "http", "json", "log", "noise", "sql", "toml", "url"]
 
 # default features
 cellularnoise = ["rand"]
@@ -55,6 +56,7 @@ http = ["reqwest", "serde", "serde_json", "once_cell", "jobs"]
 json = ["serde", "serde_json"]
 log = ["chrono"]
 sql = ["mysql", "serde", "serde_json", "once_cell", "dashmap", "jobs"]
+toml = ["serde", "serde_json", "toml-dep"]
 url = ["url-dep", "percent-encoding"]
 
 # non-default features

README.md

@@ -88,6 +88,7 @@ The default features are:
 * log: Faster log output.
 * sql: Asynchronous MySQL/MariaDB client library.
 * noise: 2d Perlin noise.
+* toml: TOML parser.
 
 Additional features are:
 * hash: Faster replacement for `md5`, support for SHA-1, SHA-256, and SHA-512. Requires OpenSSL on Linux.

dmsrc/toml.dm

@@ -0,0 +1 @@
+#define rustg_read_toml_file(path) json_decode(call(RUST_G, "toml_file_to_json")(path) || "null")

src/error.rs

@@ -46,6 +46,9 @@ pub enum Error {
     #[cfg(feature = "http")]
     #[error(transparent)]
     RequestError(#[from] reqwest::Error),
+    #[cfg(feature = "toml")]
+    #[error(transparent)]
+    TomlDeserializationError(#[from] toml_dep::de::Error),
     #[cfg(feature = "http")]
     #[error(transparent)]
     SerializationError(#[from] serde_json::Error),

src/lib.rs

@@ -26,6 +26,8 @@ pub mod log;
 pub mod noise_gen;
 #[cfg(feature = "sql")]
 pub mod sql;
+#[cfg(feature = "toml")]
+pub mod toml;
 #[cfg(feature = "unzip")]
 pub mod unzip;
 #[cfg(feature = "url")]

src/toml.rs

@@ -0,0 +1,13 @@
+use crate::error::Result;
+
+byond_fn! { toml_file_to_json(path) {
+    toml_file_to_json_impl(path).ok()
+} }
+
+fn toml_file_to_json_impl(path: &str) -> Result<String> {
+    Ok(serde_json::to_string(&toml_dep::from_str::<
+        toml_dep::Value,
+    >(&std::fs::read_to_string(
+        path,
+    )?)?)?)
+}

tests/dm-tests.rs

@@ -6,6 +6,12 @@ fn git() {
     run_dm_tests("git");
 }
 
+#[cfg(feature = "toml")]
+#[test]
+fn toml() {
+    run_dm_tests("toml");
+}
+
 #[cfg(feature = "url")]
 #[test]
 fn url() {

tests/dm/toml.dme

@@ -0,0 +1,23 @@
+#include "common.dm"
+
+var/test_toml = @{"
+[database]
+enabled = true
+ports = [ 8000, 25565 ]
+data = [ ["delta", "phi"] ]
+temp_targets = { cpu = 79, case = 72 }
+"}
+
+var/test_json = @{"
+{"database":{"data":[["delta","phi"]],"enabled":true,"ports":[8000,25565],"temp_targets":{"case":72,"cpu":79}}}
+"}
+
+/test/proc/check_toml_file2json()
+    rustg_file_write(test_toml, "test.toml")
+
+    var/toml_output = json_encode(rustg_read_toml_file("test.toml"))
+    var/test_output = json_encode(json_decode(test_json)) // Double-encode so true becomes 1
+
+    // ~= checks for structural equality
+    if (toml_output != test_output)
+        CRASH("test:\n[test_toml]\n \nexpected:\n[test_output]\n \nrustg:\n[toml_output]")