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.

2 files changed, 23 insertions, 24 deletions

diff --git a/store/src/backend/mod.rs b/store/src/backend/mod.rs
index a285d635..2da08201 100644
--- a/store/src/backend/mod.rs
+++ b/store/src/backend/mod.rs
@@ -24,7 +24,7 @@ use tokio_util::compat::Compat;
 use crate::openpgp::{self, Cert, KeyID, Fingerprint};
 use crate::openpgp::parse::Parse;
 use crate::openpgp::serialize::Serialize;
-use sequoia_core as core;
+use sequoia_ipc::core as core;
 use sequoia_net as net;
 use sequoia_ipc as ipc;
 
diff --git a/store/src/lib.rs b/store/src/lib.rs
index 7a80e182..ce437669 100644
--- a/store/src/lib.rs
+++ b/store/src/lib.rs
@@ -21,7 +21,7 @@
 //! ```
 //! # use sequoia_openpgp as openpgp;
 //! # use openpgp::Fingerprint;
-//! # use sequoia_core::{Context, IPCPolicy};
+//! # use sequoia_ipc::core::{Context, IPCPolicy};
 //! # use sequoia_net as net;
 //! # use sequoia_store::*;
 //! # fn main() { f().unwrap(); }
@@ -66,15 +66,14 @@ use capnp_rpc::rpc_twoparty_capnp::Side;
 
 use sequoia_openpgp as openpgp;
 #[allow(unused_imports)]
-use sequoia_core as core;
-use sequoia_ipc;
+use sequoia_ipc::core as core;
 
 use crate::openpgp::Fingerprint;
 use crate::openpgp::KeyID;
 use crate::openpgp::Cert;
 use crate::openpgp::parse::Parse;
 use crate::openpgp::serialize::Serialize;
-use sequoia_core::Context;
+use sequoia_ipc::core::Context;
 use sequoia_ipc as ipc;
 use sequoia_net as net;
 
@@ -154,7 +153,7 @@ impl Store {
     /// # use sequoia_openpgp as openpgp;
     /// # use openpgp::Cert;
     /// # use openpgp::parse::Parse;
-    /// # use sequoia_core::{Context, IPCPolicy};
+    /// # use sequoia_ipc::core::{Context, IPCPolicy};
     /// # use sequoia_store::{Store, Result};
     /// # fn main() { f().unwrap(); }
     /// # fn f() -> Result<()> {
@@ -187,7 +186,7 @@ impl Store {
     /// # use sequoia_openpgp as openpgp;
     /// # use openpgp::Cert;
     /// # use openpgp::parse::Parse;
-    /// # use sequoia_core::{Context, IPCPolicy};
+    /// # use sequoia_ipc::core::{Context, IPCPolicy};
     /// # use sequoia_store::{Store, Result};
     /// # fn main() { f().unwrap(); }
     /// # fn f() -> Result<()> {
@@ -219,7 +218,7 @@ impl Store {
     /// # use sequoia_openpgp as openpgp;
     /// # use openpgp::Cert;
     /// # use openpgp::parse::Parse;
-    /// # use sequoia_core::{Context, IPCPolicy};
+    /// # use sequoia_ipc::core::{Context, IPCPolicy};
     /// # use sequoia_store::{Store, Result};
     /// # fn main() { f().unwrap(); }
     /// # fn f() -> Result<()> {
@@ -252,7 +251,7 @@ impl Store {
     /// # use sequoia_openpgp as openpgp;
     /// # use openpgp::{Cert, KeyID};
     /// # use openpgp::parse::Parse;
-    /// # use sequoia_core::{Context, IPCPolicy};
+    /// # use sequoia_ipc::core::{Context, IPCPolicy};
     /// # use sequoia_store::{Store, Result};
     /// # fn main() { f().unwrap(); }
     /// # fn f() -> Result<()> {
@@ -366,7 +365,7 @@ impl Mapping {
     /// ```
     /// # use sequoia_openpgp as openpgp;
     /// # use openpgp::Fingerprint;
-    /// # use sequoia_core::{Context, IPCPolicy};
+    /// # use sequoia_ipc::core::{Context, IPCPolicy};
     /// # use sequoia_net as net;
     /// # use sequoia_store::*;
     /// # fn main() { f().unwrap(); }
@@ -397,7 +396,7 @@ impl Mapping {
     /// # use sequoia_openpgp as openpgp;
     /// # use openpgp::Cert;
     /// # use openpgp::parse::Parse;
-    /// # use sequoia_core::{Context, IPCPolicy};
+    /// # use sequoia_ipc::core::{Context, IPCPolicy};
     /// # use sequoia_net as net;
     /// # use sequoia_store::*;
     /// # fn main() { f().unwrap(); }
@@ -430,7 +429,7 @@ impl Mapping {
     /// ```
     /// # use sequoia_openpgp as openpgp;
     /// # use openpgp::Fingerprint;
-    /// # use sequoia_core::{Context, IPCPolicy};
+    /// # use sequoia_ipc::core::{Context, IPCPolicy};
     /// # use sequoia_net as net;
     /// # use sequoia_store::*;
     /// # fn main() { f().unwrap(); }
@@ -467,7 +466,7 @@ impl Mapping {
     /// # use sequoia_openpgp as openpgp;
     /// # use openpgp::{Cert, KeyID};
     /// # use openpgp::parse::Parse;
-    /// # use sequoia_core::{Context, IPCPolicy};
+    /// # use sequoia_ipc::core::{Context, IPCPolicy};
     /// # use sequoia_net as net;
     /// # use sequoia_store::*;
     /// # fn main() { f().unwrap(); }
@@ -509,9 +508,9 @@ impl Mapping {
     ///
     /// ```
     /// # use sequoia_openpgp as openpgp;
-    /// # #[macro_use] use sequoia_core;
+    /// # #[macro_use] use sequoia_ipc::core;
     /// # use openpgp::Fingerprint;
-    /// # use sequoia_core::{Context, IPCPolicy};
+    /// # use sequoia_ipc::core::{Context, IPCPolicy};
     /// # use sequoia_net as net;
     /// # use sequoia_store::*;
     /// # fn main() { f().unwrap(); }
@@ -603,7 +602,7 @@ impl Binding {
     /// ```
     /// # use sequoia_openpgp as openpgp;
     /// # use openpgp::Fingerprint;
-    /// # use sequoia_core::{Context, IPCPolicy};
+    /// # use sequoia_ipc::core::{Context, IPCPolicy};
     /// # use sequoia_net as net;
     /// # use sequoia_store::*;
     /// # fn main() { f().unwrap(); }
@@ -664,10 +663,10 @@ impl Binding {
     ///
     /// ```
     /// # use sequoia_openpgp as openpgp;
-    /// # #[macro_use] use sequoia_core;
+    /// # #[macro_use] use sequoia_ipc::core;
     /// # use openpgp::Cert;
     /// # use openpgp::parse::Parse;
-    /// # use sequoia_core::{Context, IPCPolicy};
+    /// # use sequoia_ipc::core::{Context, IPCPolicy};
     /// # use sequoia_net as net;
     /// # use sequoia_store::*;
     /// # fn main() { f().unwrap(); }
@@ -719,10 +718,10 @@ impl Binding {
     ///
     /// ```
     /// # use sequoia_openpgp as openpgp;
-    /// # #[macro_use] use sequoia_core;
+    /// # #[macro_use] use sequoia_ipc::core;
     /// # use openpgp::Cert;
     /// # use openpgp::parse::Parse;
-    /// # use sequoia_core::{Context, IPCPolicy};
+    /// # use sequoia_ipc::core::{Context, IPCPolicy};
     /// # use sequoia_net as net;
     /// # use sequoia_store::*;
     /// # fn main() { f().unwrap(); }
@@ -764,9 +763,9 @@ impl Binding {
     ///
     /// ```
     /// # use sequoia_openpgp as openpgp;
-    /// # #[macro_use] use sequoia_core;
+    /// # #[macro_use] use sequoia_ipc::core;
     /// # use openpgp::Fingerprint;
-    /// # use sequoia_core::{Context, IPCPolicy};
+    /// # use sequoia_ipc::core::{Context, IPCPolicy};
     /// # use sequoia_net as net;
     /// # use sequoia_store::*;
     /// # fn main() { f().unwrap(); }
@@ -870,11 +869,11 @@ impl Key {
     ///
     /// ```
     /// # use sequoia_openpgp as openpgp;
-    /// # #[macro_use] use sequoia_core;
+    /// # #[macro_use] use sequoia_ipc::core;
     /// # use openpgp::Fingerprint;
     /// # use openpgp::Cert;
     /// # use openpgp::parse::Parse;
-    /// # use sequoia_core::{Context, IPCPolicy};
+    /// # use sequoia_ipc::core::{Context, IPCPolicy};
     /// # use sequoia_net as net;
     /// # use sequoia_store::*;
     /// # fn main() { f().unwrap(); }