From a146ac432fe1ad350808995b1fce1a8e62c26e8d Mon Sep 17 00:00:00 2001
From: Jerome Froelich <jeromefroe@uber.com>
Date: Sun, 17 Dec 2017 16:18:47 -0500
Subject: [PATCH] Update travis config and fix typo in README

---
 .travis.yml | 52 ++++++++++++++++++++++++++++++----------------------
 README.md   |  2 +-
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a3d3f2e..7830b79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,19 @@
+dist: trusty
 language: rust
+sudo: false
 
-rust:
-  - nightly
-  - beta
-  - stable
+matrix:
+  include:
+      - rust: nightly
+        env: FEATURES="--features nightly"
+      - rust: beta
+      - rust: stable
+
+cache:
+    apt: true
+    directories:
+        - target/debug/deps
+        - target/debug/build
 
 addons:
   apt:
@@ -11,24 +21,22 @@ addons:
       - libcurl4-openssl-dev
       - libelf-dev
       - libdw-dev
-      - cmake
-      - gcc
       - binutils-dev
+      - libiberty-dev
 
-script:
-  - cargo build --verbose
-  - cargo test --verbose
 
-after_success: |
-  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 &&
-  kcov --verify --coveralls-id=$TRAVIS_JOB_ID --exclude-pattern=/.cargo target/kcov target/debug/lru-* &&
-  echo "Uploaded code coverage"
\ No newline at end of file
+after_success:
+  - '[ $TRAVIS_RUST_VERSION = stable ] &&
+    LOCAL="~/.local" && export PATH=$LOCAL/bin:$PATH &&
+    wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
+    tar xzf master.tar.gz && mkdir kcov-master/build && cd kcov-master/build &&
+    cmake -DCMAKE_INSTALL_PREFIX:PATH=$LOCAL .. && make && make install && cd ../.. &&
+    ls target/debug &&
+    RUSTFLAGS="-C link-dead-code" cargo test --no-run &&
+    for file in target/debug/lru-*; do
+      if [[ -x $file ]]; then
+        mkdir -p "target/cov/$(basename $file)";
+        kcov --exclude-pattern=/.cargo,/usr/lib --verify "target/cov/$(basename $file)" "$file";
+      fi;
+    done &&
+    kcov --coveralls-id=$TRAVIS_JOB_ID --merge target/cov target/cov/*'
diff --git a/README.md b/README.md
index bafb851..b8489c1 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 
 An implementation of a LRU cache. The cache supports `put`, `get`, and `pop` operations,
 all of which are O(1). This crate was heavily influenced by the
-[LRU Cache implementation in an earlier version of Rust's std::collections crate] (https://doc.rust-lang.org/0.12.0/std/collections/lru_cache/struct.LruCache.html).
+[LRU Cache implementation in an earlier version of Rust's std::collections crate](https://doc.rust-lang.org/0.12.0/std/collections/lru_cache/struct.LruCache.html).
 
 
 ## Example