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

Rustfmt

Browse Source
This commit is contained in:
Gwenael Treguier 2015-12-15 20:57:32 +01:00
parent 0b42e3c78c
commit 13c93e0f8b
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/functions.rs
View File

@ -400,7 +400,7 @@ impl Connection {
deterministic: bool, deterministic: bool,
aggr: D) aggr: D)
-> Result<()> -> Result<()>
where D: Aggregate<A,T>, where D: Aggregate<A, T>,
T: ToResult T: ToResult
{ {
self.db self.db
@ -480,17 +480,18 @@ impl InnerConnection {
deterministic: bool, deterministic: bool,
aggr: D) aggr: D)
-> Result<()> -> Result<()>
where D: Aggregate<A,T>, where D: Aggregate<A, T>,
T: ToResult T: ToResult
{ {
unsafe extern "C" fn call_boxed_closure<A, D, T>(ctx: *mut sqlite3_context, unsafe extern "C" fn call_boxed_closure<A, D, T>(ctx: *mut sqlite3_context,
argc: c_int, argc: c_int,
argv: *mut *mut sqlite3_value) argv: *mut *mut sqlite3_value)
where D: Aggregate<A,T>, where D: Aggregate<A, T>,
T: ToResult T: ToResult
{ {
let boxed_aggr: *mut D = mem::transmute(ffi::sqlite3_user_data(ctx)); let boxed_aggr: *mut D = mem::transmute(ffi::sqlite3_user_data(ctx));
assert!(!boxed_aggr.is_null(), "Internal error - null aggregate pointer"); assert!(!boxed_aggr.is_null(),
"Internal error - null aggregate pointer");
// TODO Validate: double indirection: `pac` allocated/freed by SQLite and `ac` allocated/freed by Rust. // TODO Validate: double indirection: `pac` allocated/freed by SQLite and `ac` allocated/freed by Rust.
let pac = ffi::sqlite3_aggregate_context(ctx, ::std::mem::size_of::<*mut A>() as c_int) as *mut *mut A; let pac = ffi::sqlite3_aggregate_context(ctx, ::std::mem::size_of::<*mut A>() as c_int) as *mut *mut A;
@ -513,11 +514,12 @@ impl InnerConnection {
(*boxed_aggr).step(&mut ctx, &mut *ac); (*boxed_aggr).step(&mut ctx, &mut *ac);
} }
unsafe extern "C" fn call_boxed_final<A, D, T>(ctx: *mut sqlite3_context) unsafe extern "C" fn call_boxed_final<A, D, T>(ctx: *mut sqlite3_context)
where D: Aggregate<A,T>, where D: Aggregate<A, T>,
T: ToResult T: ToResult
{ {
let boxed_aggr: *mut D = mem::transmute(ffi::sqlite3_user_data(ctx)); let boxed_aggr: *mut D = mem::transmute(ffi::sqlite3_user_data(ctx));
assert!(!boxed_aggr.is_null(), "Internal error - null aggregate pointer"); assert!(!boxed_aggr.is_null(),
"Internal error - null aggregate pointer");
let pac = ffi::sqlite3_aggregate_context(ctx, 0) as *mut *mut A; let pac = ffi::sqlite3_aggregate_context(ctx, 0) as *mut *mut A;
if pac.is_null() || (*pac).is_null() { if pac.is_null() || (*pac).is_null() {