From d3796152970646a6e2cd3056132a91089aefd420 Mon Sep 17 00:00:00 2001 From: Nokome Bentley Date: Fri, 21 May 2021 10:49:08 +1200 Subject: [PATCH] fix(Documents): Use stencila-schema --- Cargo.lock | 14 ++++++++++++++ rust/Cargo.toml | 2 +- rust/src/documents.rs | 4 +--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0705fd014d..debcc6d76d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2693,6 +2693,7 @@ dependencies = [ "serde_json", "serde_with", "serde_yaml", + "stencila-schema", "structopt", "strum", "strum_macros", @@ -2735,6 +2736,19 @@ dependencies = [ "stencila", ] +[[package]] +name = "stencila-schema" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f9f0fd2afa995c5815277aa1cb9a472ee17ad20ce190ed73845df4845c0deb2" +dependencies = [ + "chrono", + "defaults", + "serde", + "serde_json", + "serde_with", +] + [[package]] name = "str-buf" version = "1.0.5" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 45ec7cbe0e..df8b5469d9 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -113,7 +113,7 @@ serde = { version = "1.0.126", features = ["derive", "rc"] } serde_json = "1.0.64" serde_with = "1.9.1" serde_yaml = { version = "0.8.17", optional = true } -# stencila-schema = { path = "../../schema/rs" } +stencila-schema = "1.6.1" structopt = { version = "0.3.21", optional = true } strum = { version = "0.20", features = ["derive"] } strum_macros = "0.20.1" diff --git a/rust/src/documents.rs b/rust/src/documents.rs index 98cd19d3f1..1f047ab709 100644 --- a/rust/src/documents.rs +++ b/rust/src/documents.rs @@ -13,9 +13,7 @@ use std::{ Arc, Mutex, MutexGuard, }, }; - -// use stencila_schema::CreativeWorkTypes; -type CreativeWorkTypes = serde_json::Value; +use stencila_schema::CreativeWorkTypes; #[derive(JsonSchema, Serialize)] #[schemars(deny_unknown_fields)]