openpgp: Make PacketParserResult a std::result::Result.

  - This avoids the partial implementation imitating
    std::option::Option, replacing it with std::result::Result.

  - As a benefit, std::result::Result is in the prelude, simplifying a
    lot of parsing loops.

1 files changed, 6 insertions, 6 deletions

diff --git a/openpgp-ffi/src/parse/mod.rs b/openpgp-ffi/src/parse/mod.rs
index d3ed1407..06066a9d 100644
--- a/openpgp-ffi/src/parse/mod.rs
+++ b/openpgp-ffi/src/parse/mod.rs
@@ -357,8 +357,8 @@ pub extern "C" fn pgp_packet_parser_result_tag<'a>
     let ppr = ffi_param_ref_mut!(ppr);
 
     let tag : u8 = match ppr {
-        PacketParserResult::Some(ref pp) => pp.packet.tag().into(),
-        PacketParserResult::EOF(_) => 0,
+        Ok(ref pp) => pp.packet.tag().into(),
+        Err(_) => 0,
     };
 
     tag as c_int
@@ -383,8 +383,8 @@ pub extern "C" fn pgp_packet_parser_result_packet_parser<'a>
     let ppr = ffi_param_move!(ppr);
 
     match *ppr {
-        PacketParserResult::Some(pp) => box_raw!(pp),
-        PacketParserResult::EOF(_) => {
+        Ok(pp) => box_raw!(pp),
+        Err(_) => {
             // Don't free ppr!
             forget(ppr);
             ptr::null_mut()
@@ -411,10 +411,10 @@ pub extern "C" fn pgp_packet_parser_result_eof<'a>
     let ppr = ffi_param_move!(ppr);
 
     match *ppr {
-        PacketParserResult::Some(_) => {
+        Ok(_) => {
             forget(ppr);
             ptr::null_mut()
         }
-        PacketParserResult::EOF(eof) => box_raw!(eof),
+        Err(eof) => box_raw!(eof),
     }
 }