From 02bc8da203f07b029baa2f7cf7ad9825ef7488cd Mon Sep 17 00:00:00 2001
From: kyren <kerriganw@gmail.com>
Date: Fri, 29 Jun 2018 01:24:28 -0400
Subject: [PATCH] Prepare for 0.14.0 release

---
 CHANGELOG.md | 1 +
 Cargo.toml   | 2 +-
 LICENSE      | 2 +-
 README.md    | 2 +-
 src/error.rs | 5 ++++-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3325841..ae88053 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
   be perfectly panic safe as far as *internal* invariants are concerned, but
   (afaict) they should not be marked as `RefUnwindSafe` due to internal
   mutability and thus potentially breaking *user* invariants.
+- Upgrade to require `cc` 1.0.
 - Several Lua stack checking bugs have been fixed that could have lead to
   unsafety in release mode.
 
diff --git a/Cargo.toml b/Cargo.toml
index 2a7fcc3..a3f4b83 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,7 +26,7 @@ builtin-lua = ["cc"]
 
 [dependencies]
 libc = { version = "0.2" }
-failure = { git = "https://github.com/rust-lang-nursery/failure", version = "1.0" }
+failure = { version = "0.1.1" }
 compiletest_rs = { version = "0.3", optional = true }
 
 [build-dependencies]
diff --git a/LICENSE b/LICENSE
index d7eb400..da40251 100644
--- a/LICENSE
+++ b/LICENSE
@@ -5,7 +5,7 @@ below:
 
 MIT License
 
-Copyright (c) 2017 Chucklefish LTD
+Copyright (c) 2017
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index f5ccb4a..4ec5e49 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # rlua -- High level bindings between Rust and Lua
 
-[![Build Status](https://travis-ci.org/chucklefish/rlua.svg?branch=master)](https://travis-ci.org/chucklefish/rlua)
+[![Build Status](https://travis-ci.org/kyren/rlua.svg?branch=master)](https://travis-ci.org/kyren/rlua)
 [![Latest Version](https://img.shields.io/crates/v/rlua.svg)](https://crates.io/crates/rlua)
 [![API Documentation](https://docs.rs/rlua/badge.svg)](https://docs.rs/rlua)
 
diff --git a/src/error.rs b/src/error.rs
index cd0882f..78c03ef 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -185,7 +185,10 @@ impl failure::Fail for Error {
     fn cause(&self) -> Option<&failure::Fail> {
         match *self {
             Error::CallbackError { ref cause, .. } => Some(cause.as_ref()),
-            Error::ExternalError(ref err) => err.as_fail().cause(),
+            // Error::cause simply returns the contained Fail type, which we are already displaying
+            // and returning the backtrace for, no need to repeat it as the cause.
+            // When failure 1.0 is released, this can become `err.as_fail.cause()`
+            Error::ExternalError(ref err) => err.cause().cause(),
             _ => None,
         }
     }