Skip to content
This repository was archived by the owner on Jul 11, 2021. It is now read-only.

Commit 15b5678

Browse files
committed
fix error with the borrow checkers
1 parent 61eced2 commit 15b5678

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

sync_engine/src/lib.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,15 +298,17 @@ pub extern "C" fn QueryNowInto(
298298
key_type,
299299
)),
300300
Ok(dbkey) => {
301-
let db = dbkey.loop_data.get_db();
302-
dbkey.loop_data.set_rc(Context::no_client());
303-
let (mut result, context) = {
301+
let res = {
302+
let db = dbkey.loop_data.get_db();
303+
let _rc = dbkey
304+
.loop_data
305+
.set_rc(Context::no_client());
304306
let result = do_query(&db, args[3]);
305307
let return_method =
306308
ReturnMethod::Stream { name: args[1] };
307309
let t = std::time::Instant::now()
308310
+ std::time::Duration::from_secs(10);
309-
let result = match result {
311+
let mut result = match result {
310312
Ok(r) => r.create_data_to_return(
311313
&context,
312314
&return_method,
@@ -318,10 +320,10 @@ pub extern "C" fn QueryNowInto(
318320
t,
319321
),
320322
};
321-
(result, context)
323+
Ok(result.reply(&context))
322324
};
323325
mem::forget(dbkey);
324-
Ok(result.reply(&context))
326+
res
325327
}
326328
}
327329
});
@@ -358,7 +360,7 @@ pub extern "C" fn ExecStatementNow(
358360
Ok(dbkey) => {
359361
let result = {
360362
// _rc must be
361-
// 1. Define for the call to exec_statement() and .reply(&context)
363+
// 1. Define befor the call to exec_statement() and .reply(&context)
362364
// 2. Dropped before we forget the `dbkey`
363365
let _rc = dbkey
364366
.loop_data

0 commit comments

Comments
 (0)