From 61bde461e19559720f56dae4ee257af92be009e2 Mon Sep 17 00:00:00 2001
From: Kevin K <kbknapp@gmail.com>
Date: Mon, 31 Oct 2016 15:09:20 -0400
Subject: [PATCH 1/2] chore: clippy run

---
 Cargo.toml        | 2 +-
 src/app/parser.rs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 9019da1b..28525062 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,7 +24,7 @@ ansi_term = { version = "~0.9.0",  optional = true }
 term_size = { version = "~0.2.0",  optional = true }
 libc      = { version = "~0.2.9",  optional = true }
 yaml-rust = { version = "~0.3.2",  optional = true }
-clippy    = { version = "~0.0.95", optional = true }
+clippy    = { version = "~0.0.96", optional = true }
 
 [dev-dependencies]
 regex = "~0.1.69"
diff --git a/src/app/parser.rs b/src/app/parser.rs
index 60e4c75d..b11c5268 100644
--- a/src/app/parser.rs
+++ b/src/app/parser.rs
@@ -260,6 +260,7 @@ impl<'a, 'b> Parser<'a, 'b>
         }
     }
 
+    #[cfg_attr(feature = "lints", allow(needless_borrow))]
     pub fn derive_display_order(&mut self) {
         if self.settings.is_set(AppSettings::DeriveDisplayOrder) {
             let unified = self.settings.is_set(AppSettings::UnifiedHelpMessage);

From 90df9d322398d07f8e0bd50202331886214de50e Mon Sep 17 00:00:00 2001
From: Kevin K <kbknapp@gmail.com>
Date: Mon, 31 Oct 2016 15:09:30 -0400
Subject: [PATCH 2/2] chore: moves to temp coveralls fix

---
 .travis.yml | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 271fed8e..d5e85a03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-sudo: false
+sudo: true
 language: rust
 rust:
   - nightly
@@ -10,7 +10,7 @@ matrix:
         - rust: nightly
 before_script:
   - |
-    pip install 'travis-cargo<0.2' --user &&
+    pip install git+git://github.com/kbknapp/travis-cargo.git --user &&
     export PATH=$HOME/.local/bin:$PATH
 script:
   - |
@@ -24,9 +24,27 @@ addons:
     - libcurl4-openssl-dev
     - libelf-dev
     - libdw-dev
+    - cmake
+    - gcc
+    - binutils-dev
 after_success:
   - |
-    travis-cargo --only stable coveralls --no-sudo -- --features "yaml unstable"
+    wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
+    tar xzf master.tar.gz &&
+    cd kcov-master &&
+    mkdir build &&
+    cd build &&
+    cmake .. &&
+    make &&
+    sudo make install &&
+    cd ../.. &&
+    rm -rf kcov-master &&
+    cargo clean &&
+    cargo test --no-run --features "yaml unstable" &&
+    for file in target/debug/*-*; do mkdir -p "target/cov/$(basename $file)"; kcov --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file"; done &&
+    for file in target/debug/deps/clap-*; do mkdir -p "target/cov/$(basename $file)"; kcov --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "deps/$file"; done &&
+    bash <(curl -s https://codecov.io/bash) &&
+    echo "Uploaded code coverage"
 env:
   global:
     - TRAVIS_CARGO_NIGHTLY_FEATURE=lints