openpgp: Remove convenience functions.

2 files changed, 3 insertions, 3 deletions

diff --git a/tool/src/commands/dump.rs b/tool/src/commands/dump.rs
index 7f0cc350..53c84fd6 100644
--- a/tool/src/commands/dump.rs
+++ b/tool/src/commands/dump.rs
@@ -137,9 +137,9 @@ pub fn dump<W>(input: &mut dyn io::Read, output: &mut dyn io::Write,
         let header = pp.header().clone();
         let map = pp.take_map();
 
+        let recursion_depth = pp.recursion_depth();
         let (packet, ppr_) = pp.recurse()?;
         ppr = ppr_;
-        let recursion_depth = ppr.last_recursion_depth().unwrap();
 
         dumper.packet(output, recursion_depth as usize,
                       header, packet, map, additional_fields)?;
diff --git a/tool/src/commands/mod.rs b/tool/src/commands/mod.rs
index ace0ad8d..fa8ed857 100644
--- a/tool/src/commands/mod.rs
+++ b/tool/src/commands/mod.rs
@@ -443,9 +443,9 @@ pub fn split(input: &mut dyn io::Read, prefix: &str)
             }
         }
 
+        let old_depth = Some(pp.recursion_depth());
         ppr = pp.recurse()?.1;
-        let old_depth = ppr.last_recursion_depth();
-        let new_depth = ppr.recursion_depth();
+        let new_depth = ppr.as_ref().map(|pp| pp.recursion_depth());
 
         // Update pos.
         match old_depth.cmp(&new_depth) {