Remove heapless patch, use its Debug implementation.

Author: Alex Helfet

Cargo.lock

@@ -14,17 +14,10 @@ chrono = "^0.4"
 clap = "^2.14.0"
 env_logger = "^0.4.3"
 error-chain = "^0.11.0"
-heapless = "^0.2.0"
+heapless = "^0.2.1"
 libc = "^0.2.17"
 log = "^0.3.8"
 ref_slice = "^1.1.0"
 
 [dev-dependencies]
 tempdir = "0.3.5"
-
-# Patch `heapless` with my fork until my [PR] is merged.
-# Adds methods Vec::resize() and Vec::resize_default()
-# [PR] https://github.com/japaric/heapless/pull/13
-[patch.crates-io.heapless]
-git = "https://github.com/fluffysquirrels/heapless"
-rev = "0917beb92a92d06f6267ee595a65cb0858f3ed59"

Cargo.toml

@@ -1,7 +1,6 @@
 //! Defines ITM packets and their possible contents.
 
 use heapless::Vec as HVec;
-use std::fmt::{self, Debug, Formatter};
 
 pub const MAX_PAYLOAD_SIZE: usize = 4;
 
@@ -40,6 +39,7 @@ pub enum Kind {
 }
 
 /// Contents of an Instrumentation packet, with data from a software application
+#[derive(Debug)]
 pub struct Instrumentation {
     /// Data in this packet.
     pub(crate) payload: HVec<u8, [u8; MAX_PAYLOAD_SIZE]>,
@@ -59,15 +59,3 @@ impl Instrumentation {
         self.port
     }
 }
-
-impl Debug for Instrumentation {
-    fn fmt(&self, f: &mut Formatter) -> Result<(), fmt::Error> {
-        // TODO: impl Debug for heapless::Vec, then this can just be derived.
-        //       Eq, PartialEq, Clone would be good too.
-
-        f.debug_struct("Instrumentation")
-         .field("payload", &&*self.payload)
-         .field("port", &self.port)
-         .finish()
-    }
-}