refactor: from_gura_value (json5 referenced)

Now adapted to the better approach handled by json5 equivalent method.
- DRY, avoid the value wrapper reptition via storing the match value and 
  using a final return afterwards to value wrap: `Value::new(uri, vk)`.
- Object and Array kinds now adopt the json5 iter + collect approach.

Additionally corrects the `Cargo.toml` feature `ura` to `gura`.
As the feature name conflicts with the equivalent dependency name, 
the feature needs to prefix the dependency with `dep:`, 
removing the need for the package to include `pacakge = "gura"`.

Signed-off-by: Brennan Kinney <[email protected]>

Author: polarathene

Cargo.toml

@@ -20,7 +20,7 @@ json = ["serde_json"]
 yaml = ["yaml-rust"]
 ini = ["rust-ini"]
 json5 = ["json5_rs", "serde/derive"]
-ura = ["gura"]
+gura = ["dep:gura"]
 convert-case = ["convert_case"]
 preserve_order = ["indexmap", "toml?/preserve_order", "serde_json?/preserve_order", "ron?/indexmap"]
 async = ["async-trait"]
@@ -37,7 +37,7 @@ yaml-rust = { version = "0.4", optional = true }
 rust-ini = { version = "0.19", optional = true }
 ron = { version = "0.8", optional = true }
 json5_rs = { version = "0.4", optional = true, package = "json5" }
-gura = { version = "0.5", optional = true, package = "gura" }
+gura = { version = "0.5", optional = true }
 indexmap = { version = "2.0.0", features = ["serde"], optional = true }
 convert_case = { version = "0.6", optional = true }
 pathdiff = "0.2"

src/file/format/gura.rs

@@ -18,37 +18,38 @@ pub fn parse(
 }
 
 fn from_gura_value(uri: Option<&String>, value: GuraType) -> Value {
-    match value {
-        GuraType::String(value) => Value::new(uri, ValueKind::String(value)),
+    let vk = match value {
+        GuraType::String(value) => ValueKind::String(value),
 
-        GuraType::Integer(value) => Value::new(uri, ValueKind::I64(value as i64)),
-        GuraType::BigInteger(value) => Value::new(uri, ValueKind::I128(value)),
-        GuraType::Float(value) => Value::new(uri, ValueKind::Float(value)),
+        GuraType::Integer(value) => ValueKind::I64(value as i64),
+        GuraType::BigInteger(value) => ValueKind::I128(value),
+        GuraType::Float(value) => ValueKind::Float(value),
 
-        GuraType::Bool(value) => Value::new(uri, ValueKind::Boolean(value)),
+        GuraType::Bool(value) => ValueKind::Boolean(value),
 
         GuraType::Object(table) => {
-            let mut m = Map::new();
+            let m = table
+                .into_iter()
+                .map(|(k, v)| (k, from_gura_value(uri, v)))
+                .collect();
 
-            for (key, value) in table {
-                m.insert(key, from_gura_value(uri, value));
-            }
-
-            Value::new(uri, ValueKind::Table(m))
+            ValueKind::Table(m)
         }
 
         GuraType::Array(array) => {
-            let mut l = Vec::new();
-
-            for value in array {
-                l.push(from_gura_value(uri, value));
-            }
+            let l = array
+                .into_iter()
+                .map(|v| from_gura_value(uri, v))
+                .collect();
 
-            Value::new(uri, ValueKind::Array(l))
+            ValueKind::Array(l)
         }
 
-        // Null or remaining types (only intended for internal use):
-        GuraType::Null => Value::new(uri, ValueKind::Nil),
-        _ => Value::new(uri, ValueKind::Nil),
-    }
+        GuraType::Null => ValueKind::Nil,
+
+        // Remaining types (only intended for internal use):
+        _ => ValueKind::Nil,
+    };
+
+    Value::new(uri, vk)
 }