Changes from japaric's review.

Author: Alex Helfet

src/bin/itmdump.rs

@@ -1,5 +1,4 @@
 #![deny(warnings)]
-#![feature(conservative_impl_trait)]
 
 extern crate chrono;
 extern crate clap;
@@ -103,9 +102,9 @@ fn run() -> Result<()> {
         let p = decoder.read_packet();
         match p {
             Ok(p) => {
-                match p.kind {
-                    packet::Kind::Instrumentation(ref ud) if ud.port == port => {
-                        stdout.write_all(&ud.payload)?;
+                match p.kind() {
+                    &packet::Kind::Instrumentation(ref i) if i.port() == port => {
+                        stdout.write_all(&i.payload())?;
                     }
                     _ => (),
                 }
@@ -139,7 +138,7 @@ fn run() -> Result<()> {
     // Unreachable.
 }
 
-fn open_read<'a>(matches: &ArgMatches) -> Result<impl io::Read + 'a> {
+fn open_read(matches: &ArgMatches) -> Result<Box<io::Read + 'static>> {
     let path = matches.value_of("file");
     Ok(match path {
         Some(path) => {

src/packet.rs

@@ -9,10 +9,22 @@ pub const MAX_PAYLOAD_SIZE: usize = 4;
 #[derive(Debug)]
 pub struct Packet {
     /// The header byte received for this packet.
-    pub header: u8,
+    pub(crate) header: u8,
 
     /// The kind (type) of this packet.
-    pub kind: Kind,
+    pub(crate) kind: Kind,
+}
+
+impl Packet {
+    /// Returns the header byte received for this packet.
+    pub fn header(&self) -> u8 {
+        self.header
+    }
+
+    /// The kind (type) of this packet.
+    pub fn kind(&self) -> &Kind {
+        &self.kind
+    }
 }
 
 /// The type of a packet.
@@ -30,10 +42,22 @@ pub enum Kind {
 /// Contents of an Instrumentation packet, with data from a software application
 pub struct Instrumentation {
     /// Data in this packet.
-    pub payload: HVec<u8, [u8; MAX_PAYLOAD_SIZE]>,
+    pub(crate) payload: HVec<u8, [u8; MAX_PAYLOAD_SIZE]>,
 
     /// Stimulus port this packet was sent from.
-    pub port: u8,
+    pub(crate) port: u8,
+}
+
+impl Instrumentation {
+    /// Data in this packet.
+    pub fn payload(&self) -> &[u8] {
+        &*self.payload
+    }
+
+    /// Stimulus port this packet was sent from.
+    pub fn port(&self) -> u8 {
+        self.port
+    }
 }
 
 impl Debug for Instrumentation {