From bae6556fed3730de0589ae6ef5beecd1b674c96f Mon Sep 17 00:00:00 2001
From: Thijs Cadier <thijs@appsignal.com>
Date: Tue, 10 Nov 2015 16:39:24 +0100
Subject: [PATCH] Updates for newest nightly and bindgen

---
 mongoc-sys/build.rs | 3 ---
 src/bsonc.rs        | 2 +-
 src/lib.rs          | 6 +++---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/mongoc-sys/build.rs b/mongoc-sys/build.rs
index f8857ad..1b65bd6 100644
--- a/mongoc-sys/build.rs
+++ b/mongoc-sys/build.rs
@@ -1,9 +1,6 @@
-#![feature(path_ext)]
-
 extern crate bindgen;
 
 use std::env;
-use std::fs::PathExt;
 use std::path::Path;
 use std::process::Command;
 
diff --git a/src/bsonc.rs b/src/bsonc.rs
index 4685093..e51a9cd 100644
--- a/src/bsonc.rs
+++ b/src/bsonc.rs
@@ -3,7 +3,7 @@ use std::ptr;
 use std::borrow::Cow;
 use std::fmt;
 use std::slice;
-use libc::types::common::c95::c_void;
+use libc::c_void;
 
 use mongoc::bindings;
 use bson;
diff --git a/src/lib.rs b/src/lib.rs
index 7619664..e84f376 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -52,14 +52,14 @@ fn init() {
     });
 }
 
-extern fn mongoc_log_handler(
+unsafe extern "C" fn mongoc_log_handler(
     log_level:  bindings::mongoc_log_level_t,
     log_domain: *const ::libc::c_char,
     message:    *const ::libc::c_char,
     _:          *mut ::libc::c_void
 ) {
-    let log_domain_str = unsafe { CStr::from_ptr(log_domain).to_string_lossy() };
-    let message_str = unsafe { CStr::from_ptr(message).to_string_lossy() };
+    let log_domain_str = CStr::from_ptr(log_domain).to_string_lossy();
+    let message_str = CStr::from_ptr(message).to_string_lossy();
     let log_line = format!("mongoc: {} - {}", log_domain_str, message_str);
 
     match log_level {