From a8a00555b5f40ce3041772b7e6676129bc57aa99 Mon Sep 17 00:00:00 2001
From: Alex Helfet <alex.helfet@gmail.com>
Date: Sun, 24 Dec 2017 21:35:18 +0000
Subject: [PATCH] Add build variants with feature `trace`, fix build for those
 variants.

---
 bin/build_local   |  5 +++--
 bin/travis/script |  1 +
 src/lib.rs        | 10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/bin/build_local b/bin/build_local
index 3fd84a6..9504349 100755
--- a/bin/build_local
+++ b/bin/build_local
@@ -1,12 +1,13 @@
 #!/usr/bin/env bash
 set -ex
 
-# A simple build script to run locally.
+# A simple build script to run locally before pushing.
 
-for tc in stable beta nightly; do
+for tc in nightly stable beta; do
     echo "Toolchain: ${tc}";
     rustup toolchain update ${tc};
     cargo +${tc} test --verbose;
     cargo +${tc} test --verbose --no-default-features;
+    cargo +${tc} test --verbose --features=trace;
     cargo +${tc} doc --verbose;
 done
diff --git a/bin/travis/script b/bin/travis/script
index f2d0c88..e66a786 100755
--- a/bin/travis/script
+++ b/bin/travis/script
@@ -6,4 +6,5 @@ set -x
 
 cargo test --verbose;
 cargo test --verbose --no-default-features;
+cargo test --verbose --no-default-features --features=trace;
 cargo doc --verbose;
diff --git a/src/lib.rs b/src/lib.rs
index 8ed6ac5..0ac1df6 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -198,7 +198,7 @@ pub fn encode_to_slice(p: &Payload, dest: &mut [u8]) -> Result<usize> {
     dest[footer_idx] = FRAME_END_SYMBOL;
 
     #[cfg(feature = "trace")] {
-        println!("framed: Frame code = {:?}", dest[0..(footer_idx + 1)]);
+        println!("framed: Frame code = {:?}", &dest[0..(footer_idx + 1)]);
     }
     Ok(cobs_len + HEADER_LEN + FOOTER_LEN)
 }
@@ -266,16 +266,16 @@ pub fn decode_to_slice(e: &Encoded, mut dest: &mut [u8])
     let body = &e[0..(e.len()-1)];
 
     let len = cobs::decode(body, &mut dest)
-                   .map_err(|_| Error::CobsDecodeFailed);
+                   .map_err(|_| Error::CobsDecodeFailed)?;
 
     #[cfg(feature = "trace")] {
-        println!("framed: frame = {:?}\n\
+        println!("framed: dest = {:?}\n\
                   framed: body = {:?}\n\
                   framed: decoded = {:?}",
-                 frame, body, dest[0..len]);
+                 &dest, body, &dest[0..len]);
     }
 
-    Ok(len?)
+    Ok(len)
 }
 
 /// Decode the supplied encoded frame, returning the payload on the heap.