From c0b8be99e8bcaa1d8abb451aa652989c95e52e3a Mon Sep 17 00:00:00 2001
From: John Gallagher <jgallagher@bignerdranch.com>
Date: Tue, 29 Mar 2016 16:09:49 -0400
Subject: [PATCH 1/2] Fix crash due to 0-sized function type change in nightly

---
 src/trace.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/trace.rs b/src/trace.rs
index bd3b537..a36aa33 100644
--- a/src/trace.rs
+++ b/src/trace.rs
@@ -35,7 +35,9 @@ pub unsafe fn config_log(callback: Option<fn(c_int, &str)>) -> Result<()> {
     let rc = match callback {
         Some(f) => {
             let p_arg: *mut c_void = mem::transmute(f);
-            ffi::sqlite3_config(ffi::SQLITE_CONFIG_LOG, Some(log_callback), p_arg)
+            ffi::sqlite3_config(ffi::SQLITE_CONFIG_LOG,
+                                log_callback as extern "C" fn(_, _, _),
+                                p_arg)
         }
         None => {
             let nullptr: *mut c_void = ptr::null_mut();

From 43be3a84fa1ab245df448c084366c537d5b44553 Mon Sep 17 00:00:00 2001
From: John Gallagher <jgallagher@bignerdranch.com>
Date: Tue, 29 Mar 2016 16:15:41 -0400
Subject: [PATCH 2/2] Add bugfix to Changelog

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 36b0f3e..6c401f0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,6 @@
 # Version UPCOMING (...)
 
+* Fixes crash on nightly Rust when using the `trace` feature.
 * Adds optional `clippy` feature and addresses issues it found.
 * Adds `column_count()` method to `Statement` and `Row`.
 * Adds `types::Value` for dynamic column types.