summaryrefslogtreecommitdiffstats
path: root/ffi/src
diff options
context:
space:
mode:
authorWiktor Kwapisiewicz <wiktor@metacode.biz>2021-03-26 14:30:09 +0100
committerWiktor Kwapisiewicz <wiktor@metacode.biz>2021-03-31 11:29:22 +0200
commit80cdf06912ce0217c8af77f9b02b4377095cb803 (patch)
tree575203e2c48e693e52b0ba5e36ac333a3c85c83f /ffi/src
parent4516d5b4c39a765583f9f2fe4bad54bbe70de0c9 (diff)
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.
Diffstat (limited to 'ffi/src')
-rw-r--r--ffi/src/core.rs4
-rw-r--r--ffi/src/error.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/ffi/src/core.rs b/ffi/src/core.rs
index a24c2137..59f465b7 100644
--- a/ffi/src/core.rs
+++ b/ffi/src/core.rs
@@ -41,8 +41,8 @@
use std::ptr;
use libc::{c_char, c_int};
-use sequoia_core as core;
-use sequoia_core::Config;
+use sequoia_ipc::core as core;
+use sequoia_ipc::core::Config;
/// Wraps a Context and provides an error slot.
#[doc(hidden)]
diff --git a/ffi/src/error.rs b/ffi/src/error.rs
index ebce4e0d..b00984a1 100644
--- a/ffi/src/error.rs
+++ b/ffi/src/error.rs
@@ -3,7 +3,7 @@
use std::io;
use sequoia_openpgp as openpgp;
-use sequoia_core as core;
+use sequoia_ipc::core as core;
use sequoia_net as net;
pub use crate::openpgp::error::Status;