openpgp: Make PacketParser's map field private.

3 files changed, 3 insertions, 3 deletions

diff --git a/tool/src/commands/decrypt.rs b/tool/src/commands/decrypt.rs
index 9fc93f2a..d6f9a468 100644
--- a/tool/src/commands/decrypt.rs
+++ b/tool/src/commands/decrypt.rs
@@ -114,7 +114,7 @@ impl<'a> DecryptionHelper for Helper<'a> {
             dumper.packet(&mut io::stderr(),
                           pp.recursion_depth() as usize,
                           pp.header.clone(), pp.packet.clone(),
-                          pp.map.clone(), None)?;
+                          pp.map().map(|m| m.clone()), None)?;
         }
         Ok(())
     }
diff --git a/tool/src/commands/dump.rs b/tool/src/commands/dump.rs
index d883ce90..5f7ec627 100644
--- a/tool/src/commands/dump.rs
+++ b/tool/src/commands/dump.rs
@@ -33,7 +33,7 @@ pub fn dump(input: &mut io::Read, output: &mut io::Write, mpis: bool, hex: bool)
         };
 
         let header = pp.header.clone();
-        let map = pp.map.take();
+        let map = pp.take_map();
 
         let (packet, ppr_) = pp.recurse()?;
         ppr = ppr_;
diff --git a/tool/src/commands/mod.rs b/tool/src/commands/mod.rs
index a92b84ef..fa265747 100644
--- a/tool/src/commands/mod.rs
+++ b/tool/src/commands/mod.rs
@@ -595,7 +595,7 @@ pub fn split(input: &mut io::Read, prefix: &str)
     let mut pos = vec![0];
 
     while let PacketParserResult::Some(pp) = ppr {
-        if let Some(ref map) = pp.map {
+        if let Some(ref map) = pp.map() {
             let filename = format!(
                 "{}{}--{:?}", prefix,
                 pos.iter().map(|n| format!("{}", n))