Update src/file/format/jsonc.rs

Co-authored-by: Brennan Kinney <[email protected]>

Author: up9cloud

src/file/format/jsonc.rs

@@ -10,22 +10,9 @@ pub(crate) fn parse(
     uri: Option<&String>,
     text: &str,
 ) -> Result<Map<String, Value>, Box<dyn Error + Send + Sync>> {
-    match jsonc_parser::parse_to_value(text, &Default::default())? {
-        Some(r) => match r {
-            JsonValue::String(ref value) => Err(Unexpected::Str(value.to_string())),
-            JsonValue::Number(value) => Err(Unexpected::Float(value.parse::<f64>().unwrap())),
-            JsonValue::Boolean(value) => Err(Unexpected::Bool(value)),
-            JsonValue::Object(o) => match from_jsonc_value(uri, JsonValue::Object(o)).kind {
-                ValueKind::Table(map) => Ok(map),
-                _ => unreachable!(),
-            },
-            JsonValue::Array(_) => Err(Unexpected::Seq),
-            JsonValue::Null => Err(Unexpected::Unit),
-        },
-        None => Err(Unexpected::Unit),
-    }
-    .map_err(|err| ConfigError::invalid_root(uri, err))
-    .map_err(|err| Box::new(err) as Box<dyn Error + Send + Sync>)
+    let parsed = jsonc_parser::parse_to_value(text, &Default::default())?;
+    let value = from_jsonc_value(uri, parsed.unwrap_or(ValueKind::Nil));
+    format::extract_root_table(uri, value)
 }
 
 fn from_jsonc_value(uri: Option<&String>, value: JsonValue<'_>) -> Value {