summaryrefslogtreecommitdiffstats
path: root/store
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2019-08-19 15:36:47 +0200
committerJustus Winter <justus@sequoia-pgp.org>2019-08-19 15:36:47 +0200
commit63637840a92f237b21369f2b8cb2c202d33613fc (patch)
tree0ee483ea20eae9bc63297ac8a2c75f4d56ccea4e /store
parentbcd5ab8751c14f4ac48a2ea8b7d90163eb306b5f (diff)
net: Drop the sync variant.
- The sync wrapper hide the async nature of the implementation, and while this may seem convenient, it may cause subtle problems if it is invoked from a different event loop. - Furthermore, 'async' is a reserved keyword in the 2018 edition, requiring awkward escaping. - Fixes #307.
Diffstat (limited to 'store')
-rw-r--r--store/src/backend/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/store/src/backend/mod.rs b/store/src/backend/mod.rs
index 4ecc3aed..6312373f 100644
--- a/store/src/backend/mod.rs
+++ b/store/src/backend/mod.rs
@@ -877,7 +877,7 @@ impl KeyServer {
network_policy: core::NetworkPolicy)
-> Result<(KeyServer,
openpgp::KeyID,
- net::r#async::KeyServer)> {
+ net::KeyServer)> {
assert!(network_policy != core::NetworkPolicy::Offline);
let network_policy_u8 = u8::from(&network_policy);
@@ -896,7 +896,7 @@ impl KeyServer {
let ctx = core::Context::configure()
.network_policy(network_policy).build()?;
- let keyserver = net::r#async::KeyServer::sks_pool(&ctx)?;
+ let keyserver = net::KeyServer::sks_pool(&ctx)?;
Ok((KeyServer::new(c.clone(), id),
fingerprint.to_keyid(),