From 80cdf06912ce0217c8af77f9b02b4377095cb803 Mon Sep 17 00:00:00 2001 From: Wiktor Kwapisiewicz Date: Fri, 26 Mar 2021 14:30:09 +0100 Subject: ipc: Incorporate sequoia-core crate as a core module. - This moves all functionality from sequoia_core crate as an inner `core` module of the ipc crate. - The `core` module has to be public as other crates depend on `core::Context` either directly (store, ffi) or indirectly (store through ffi crate). - Remove the `core` crate completely. --- Cargo.lock | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'Cargo.lock') diff --git a/Cargo.lock b/Cargo.lock index f7bfbf8e..ff67f008 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1764,16 +1764,6 @@ dependencies = [ "sequoia-openpgp", ] -[[package]] -name = "sequoia-core" -version = "0.22.0" -dependencies = [ - "anyhow", - "dirs 2.0.2", - "tempfile", - "thiserror", -] - [[package]] name = "sequoia-ffi" version = "0.22.0" @@ -1784,8 +1774,8 @@ dependencies = [ "libc", "memsec", "native-tls", - "sequoia-core", "sequoia-ffi-macros", + "sequoia-ipc", "sequoia-net", "sequoia-openpgp", "sequoia-store", @@ -1820,6 +1810,7 @@ dependencies = [ "capnp-rpc", "clap", "ctor", + "dirs 2.0.2", "fs2", "futures", "lalrpop", @@ -1829,7 +1820,6 @@ dependencies = [ "memsec", "quickcheck", "rand", - "sequoia-core", "sequoia-openpgp", "socket2", "tempfile", @@ -1948,7 +1938,6 @@ dependencies = [ "futures-util", "rand", "rusqlite", - "sequoia-core", "sequoia-ipc", "sequoia-net", "sequoia-openpgp", -- cgit v1.2.3