From c75a4d60e6a10b3559370498a99ab946f6846043 Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Thu, 2 Apr 2020 10:35:11 +0200
Subject: openpgp: Drop KeyID::from_hex in favor of FromStr.

  - See #462.
---
 net/src/lib.rs   | 2 +-
 net/tests/hkp.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'net')

diff --git a/net/src/lib.rs b/net/src/lib.rs
index 4e7c4655..17c790aa 100644
--- a/net/src/lib.rs
+++ b/net/src/lib.rs
@@ -27,7 +27,7 @@
 //! let mut core = Core::new().unwrap();
 //! let ctx = Context::new()?;
 //! let mut ks = KeyServer::keys_openpgp_org(&ctx)?;
-//! let keyid = KeyID::from_hex("31855247603831FD").unwrap();
+//! let keyid = "31855247603831FD".parse().unwrap();
 //! println!("{:?}", core.run(ks.get(&keyid)));
 //! Ok(())
 //! # }
diff --git a/net/tests/hkp.rs b/net/tests/hkp.rs
index 0a2121f0..889aeaae 100644
--- a/net/tests/hkp.rs
+++ b/net/tests/hkp.rs
@@ -26,7 +26,7 @@ extern crate sequoia_net;
 
 use crate::openpgp::armor::Reader;
 use crate::openpgp::Cert;
-use crate::openpgp::{Fingerprint, KeyID};
+use crate::openpgp::Fingerprint;
 use crate::openpgp::parse::Parse;
 use sequoia_core::{Context, NetworkPolicy};
 use sequoia_net::KeyServer;
@@ -155,7 +155,7 @@ fn get() {
 
     let mut keyserver =
         KeyServer::new(&ctx, &format!("hkp://{}", addr)).unwrap();
-    let keyid = KeyID::from_hex(ID).unwrap();
+    let keyid = ID.parse().unwrap();
     let key = core.run(keyserver.get(&keyid)).unwrap();
 
     assert_eq!(key.fingerprint(),
-- 
cgit v1.2.3