Skip to content

Commit 02bc8da

Browse files
committedJun 29, 2018
Prepare for 0.14.0 release
1 parent 31fa917 commit 02bc8da

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed
 

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
be perfectly panic safe as far as *internal* invariants are concerned, but
2222
(afaict) they should not be marked as `RefUnwindSafe` due to internal
2323
mutability and thus potentially breaking *user* invariants.
24+
- Upgrade to require `cc` 1.0.
2425
- Several Lua stack checking bugs have been fixed that could have lead to
2526
unsafety in release mode.
2627

‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ builtin-lua = ["cc"]
2626

2727
[dependencies]
2828
libc = { version = "0.2" }
29-
failure = { git = "https://github.com/rust-lang-nursery/failure", version = "1.0" }
29+
failure = { version = "0.1.1" }
3030
compiletest_rs = { version = "0.3", optional = true }
3131

3232
[build-dependencies]

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ below:
55

66
MIT License
77

8-
Copyright (c) 2017 Chucklefish LTD
8+
Copyright (c) 2017
99

1010
Permission is hereby granted, free of charge, to any person obtaining a copy
1111
of this software and associated documentation files (the "Software"), to deal

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# rlua -- High level bindings between Rust and Lua
22

3-
[![Build Status](https://travis-ci.org/chucklefish/rlua.svg?branch=master)](https://travis-ci.org/chucklefish/rlua)
3+
[![Build Status](https://travis-ci.org/kyren/rlua.svg?branch=master)](https://travis-ci.org/kyren/rlua)
44
[![Latest Version](https://img.shields.io/crates/v/rlua.svg)](https://crates.io/crates/rlua)
55
[![API Documentation](https://docs.rs/rlua/badge.svg)](https://docs.rs/rlua)
66

‎src/error.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,10 @@ impl failure::Fail for Error {
185185
fn cause(&self) -> Option<&failure::Fail> {
186186
match *self {
187187
Error::CallbackError { ref cause, .. } => Some(cause.as_ref()),
188-
Error::ExternalError(ref err) => err.as_fail().cause(),
188+
// Error::cause simply returns the contained Fail type, which we are already displaying
189+
// and returning the backtrace for, no need to repeat it as the cause.
190+
// When failure 1.0 is released, this can become `err.as_fail.cause()`
191+
Error::ExternalError(ref err) => err.cause().cause(),
189192
_ => None,
190193
}
191194
}

0 commit comments

Comments
 (0)