Feature valuable

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_json"
-version = "1.0.141"
+version = "1.0.142"
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 categories = ["encoding", "parser-implementations", "no-std"]
 description = "A JSON serialization file format"
@@ -17,6 +17,7 @@ itoa = "1.0"
 memchr = { version = "2", default-features = false }
 ryu = "1.0"
 serde = { version = "1.0.194", default-features = false }
+valuable = { version = "0.1.1", optional = true }
 
 [dev-dependencies]
 automod = "1.0.11"
@@ -89,3 +90,6 @@ raw_value = []
 # overflow the stack after deserialization has completed, including, but not
 # limited to, Display and Debug and Drop impls.
 unbounded_depth = []
+
+# Implement the valuable trait for serde_json::Value
+valua = ["valuable"]

src/lib.rs

@@ -436,3 +436,6 @@ mod read;
 
 #[cfg(feature = "raw_value")]
 mod raw;
+
+#[cfg(feature = "valua")]
+mod valuable;

src/valuable.rs

@@ -0,0 +1,79 @@
+use crate::{Map, Value as Json};
+use alloc::string::String;
+
+use valuable::{Mappable, Valuable, Value, Visit};
+
+impl Valuable for Json {
+    fn as_value(&self) -> Value<'_> {
+        match self {
+            Json::Array(ref array) => array.as_value(),
+            Json::Bool(ref value) => value.as_value(),
+            Json::Number(ref num) => {
+                if num.is_f64() {
+                    Value::F64(num.as_f64().unwrap())
+                } else if num.is_i64() {
+                    Value::I64(num.as_i64().unwrap())
+                } else {
+                    unreachable!()
+                }
+            }
+            Json::Null => Value::Unit,
+            Json::String(ref s) => s.as_value(),
+            Json::Object(ref object) => object.as_value(),
+        }
+    }
+
+    fn visit(&self, visit: &mut dyn Visit) {
+        match self {
+            Json::Array(ref array) => array.visit(visit),
+            Json::Bool(ref value) => value.visit(visit),
+            Json::Number(ref num) => {
+                if num.is_f64() {
+                    num.as_f64().unwrap().visit(visit)
+                } else if num.is_i64() {
+                    num.as_i64().unwrap().visit(visit)
+                } else {
+                    unreachable!()
+                }
+            }
+            Json::Null => Value::Unit.visit(visit),
+            Json::String(ref s) => s.visit(visit),
+            Json::Object(ref object) => object.visit(visit),
+        }
+    }
+}
+
+impl Valuable for Map<String, Json> {
+    fn as_value(&self) -> Value<'_> {
+        Value::Mappable(self)
+    }
+
+    fn visit(&self, visit: &mut dyn Visit) {
+        for (k, v) in self.iter() {
+            visit.visit_entry(k.as_value(), v.as_value());
+        }
+    }
+}
+
+impl Mappable for Map<String, Json> {
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = self.len();
+        (len, Some(len))
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::json;
+    use valuable::{Valuable, Value};
+
+    #[test]
+    fn test_json() {
+        let j = json!({"a": 100, "b": 1.0, "c": -1});
+        let jv = j.as_value();
+
+        assert!(matches!(jv, Value::Mappable(_)));
+
+        assert!(matches!(json!(100).as_value(), Value::I64(_)));
+    }
+}