diff options
Diffstat (limited to 'openpgp/src/packet_pile.rs')
| -rw-r--r-- | openpgp/src/packet_pile.rs | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/openpgp/src/packet_pile.rs b/openpgp/src/packet_pile.rs index c910f538..aa42aac9 100644 --- a/openpgp/src/packet_pile.rs +++ b/openpgp/src/packet_pile.rs @@ -159,7 +159,7 @@ impl PacketPile { /// /// ```rust /// # extern crate openpgp; - /// # use openpgp::{Result, constants::CompressionAlgorithm, + /// # use openpgp::{Result, constants::{CompressionAlgorithm, DataFormat}, /// # Packet, PacketPile, Literal, CompressedData}; /// /// # fn main() { f().unwrap(); } @@ -167,13 +167,14 @@ impl PacketPile { /// // A compressed data packet that contains a literal data packet. /// let mut pile = PacketPile::from_packet( /// CompressedData::new(CompressionAlgorithm::Uncompressed) - /// .push(Literal::new('t').body(b"old".to_vec()).to_packet()) + /// .push(Literal::new(DataFormat::Text).body(b"old".to_vec()) + /// .to_packet()) /// .to_packet()); /// /// // Replace the literal data packet. /// pile.replace( /// &[ 0, 0 ], 1, - /// [ Literal::new('t').body(b"new".to_vec()).to_packet() ] + /// [ Literal::new(DataFormat::Text).body(b"new".to_vec()).to_packet() ] /// .to_vec()) /// .unwrap(); /// # if let Some(Packet::Literal(lit)) = pile.path_ref(&[0, 0]) { @@ -430,6 +431,7 @@ mod message_test { use super::*; use CompressionAlgorithm; + use constants::DataFormat::Text; use Literal; use CompressedData; use SEIP; @@ -648,7 +650,7 @@ mod message_test { let mut cd = CompressedData::new(CompressionAlgorithm::Uncompressed); for t in text.iter() { - cd = cd.push(Literal::new('t').body(t.to_vec()).to_packet()) + cd = cd.push(Literal::new(Text).body(t.to_vec()).to_packet()) } let mut seip = SEIP { @@ -714,7 +716,7 @@ mod message_test { // => // 0: Literal("two") let mut packets : Vec<Packet> = Vec::new(); - packets.push(Literal::new('t').body(b"one".to_vec()).to_packet()); + packets.push(Literal::new(Text).body(b"one".to_vec()).to_packet()); assert!(packets.iter().map(|p| p.tag()).collect::<Vec<Tag>>() == [ Tag::Literal ]); @@ -722,7 +724,7 @@ mod message_test { let mut pile = PacketPile::from_packets(packets.clone()); pile.replace( &[ 0 ], 1, - [ Literal::new('t').body(b"two".to_vec()).to_packet() + [ Literal::new(Text).body(b"two".to_vec()).to_packet() ].to_vec()).unwrap(); let children = pile.into_children().collect::<Vec<Packet>>(); @@ -743,7 +745,7 @@ mod message_test { let mut packets : Vec<Packet> = Vec::new(); for text in initial.iter() { - packets.push(Literal::new('t').body(text.to_vec()).to_packet()) + packets.push(Literal::new(Text).body(text.to_vec()).to_packet()) } for start in 0..initial.len() + 1 { @@ -754,7 +756,7 @@ mod message_test { let mut replacement : Vec<Packet> = Vec::new(); for &text in inserted[0..insert].iter() { replacement.push( - Literal::new('t').body(text.to_vec()).to_packet()) + Literal::new(Text).body(text.to_vec()).to_packet()) } pile.replace(&[ start ], delete, replacement).unwrap(); @@ -793,7 +795,7 @@ mod message_test { let mut cd = CompressedData::new(CompressionAlgorithm::Uncompressed); for l in initial.iter() { - cd = cd.push(Literal::new('t').body(l.to_vec()).to_packet()) + cd = cd.push(Literal::new(Text).body(l.to_vec()).to_packet()) } for start in 0..initial.len() + 1 { @@ -805,7 +807,7 @@ mod message_test { let mut replacement : Vec<Packet> = Vec::new(); for &text in inserted[0..insert].iter() { replacement.push( - Literal::new('t').body(text.to_vec()).to_packet()) + Literal::new(Text).body(text.to_vec()).to_packet()) } pile.replace(&[ 0, start ], delete, replacement).unwrap(); @@ -838,7 +840,7 @@ mod message_test { // Make sure out-of-range accesses error out. let mut packets : Vec<Packet> = Vec::new(); - packets.push(Literal::new('t').body(b"one".to_vec()).to_packet()); + packets.push(Literal::new(Text).body(b"one".to_vec()).to_packet()); let mut pile = PacketPile::from_packets(packets.clone()); assert!(pile.replace(&[ 1 ], 0, Vec::new()).is_ok()); |