From 247c1712ba17aa9c23aedab12697f49ec4e800d0 Mon Sep 17 00:00:00 2001 From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> Date: Mon, 26 Apr 2021 11:51:36 -0600 Subject: [PATCH] re-export json-ptr (#4) --- patch-db-macro-internals/src/lib.rs | 10 +++++----- patch-db/src/lib.rs | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/patch-db-macro-internals/src/lib.rs b/patch-db-macro-internals/src/lib.rs index 3f5042a..e46c86c 100644 --- a/patch-db-macro-internals/src/lib.rs +++ b/patch-db-macro-internals/src/lib.rs @@ -157,14 +157,14 @@ fn build_model_struct( &self.0 } } - impl From for #model_name { - fn from(ptr: json_ptr::JsonPointer) -> Self { + impl From for #model_name { + fn from(ptr: patch_db::json_ptr::JsonPointer) -> Self { #model_name(#inner_model::from(ptr)) } } impl From> for #model_name { fn from(model: patch_db::Model<#base_name>) -> Self { - #model_name(#inner_model::from(json_ptr::JsonPointer::from(model))) + #model_name(#inner_model::from(patch_db::json_ptr::JsonPointer::from(model))) } } impl From<#inner_model> for #model_name { @@ -232,8 +232,8 @@ fn build_model_struct( } )* } - impl From for #model_name { - fn from(ptr: json_ptr::JsonPointer) -> Self { + impl From for #model_name { + fn from(ptr: patch_db::json_ptr::JsonPointer) -> Self { #model_name(From::from(ptr)) } } diff --git a/patch-db/src/lib.rs b/patch-db/src/lib.rs index 1cd92ef..4ca0282 100644 --- a/patch-db/src/lib.rs +++ b/patch-db/src/lib.rs @@ -21,6 +21,7 @@ pub use patch::Revision; pub use patch_db_macro::HasModel; pub use store::{PatchDb, Store}; pub use transaction::{Checkpoint, SubTransaction, Transaction}; +pub use json_ptr; #[derive(Error, Debug)] pub enum Error {