ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2024-11-30 06:01:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #137 from jgallagher/fix-nightly-crash

Browse Source 
Fix crash due to 0-sized function type change in nightly
This commit is contained in:
John Gallagher 2016-03-29 16:32:23 -04:00
commit d6e604af77
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -1,5 +1,6 @@
# Version UPCOMING (...) # Version UPCOMING (...)
* Fixes crash on nightly Rust when using the `trace` feature.
* Adds optional `clippy` feature and addresses issues it found. * Adds optional `clippy` feature and addresses issues it found.
* Adds `column_count()` method to `Statement` and `Row`. * Adds `column_count()` method to `Statement` and `Row`.
* Adds `types::Value` for dynamic column types. * Adds `types::Value` for dynamic column types.

4
src/trace.rs
View File

@ -35,7 +35,9 @@ pub unsafe fn config_log(callback: Option<fn(c_int, &str)>) -> Result<()> {
let rc = match callback { let rc = match callback {
Some(f) => { Some(f) => {
let p_arg: *mut c_void = mem::transmute(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 => { None => {
let nullptr: *mut c_void = ptr::null_mut(); let nullptr: *mut c_void = ptr::null_mut();