Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Valuable bridge for serde_json::Value #61

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions valuable/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ std = ["alloc"]
# Provide imps for types in Rust's `alloc` library.
alloc = []

# Provides serde_json::Value instrument for valuable
json = ["serde_json"]

[dependencies]
valuable-derive = { version = "0.1.0", optional = true, path = "../valuable-derive" }
serde_json = { version = "1.0.46", optional = true }

[dev-dependencies]
criterion = "0.3"
Expand Down
78 changes: 78 additions & 0 deletions valuable/src/json.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
use serde_json::{Map, Value as Json};

use crate::{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::{Valuable, Value};
use serde_json::json;

#[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(_)));
}
}
3 changes: 3 additions & 0 deletions valuable/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,6 @@ pub use visit::{visit, Visit};

#[cfg(feature = "derive")]
pub use valuable_derive::*;

#[cfg(feature = "json")]
mod json;