Skip to content

Commit 0696d9f

Browse files
committed
remove variable shadowing
1 parent d8b344b commit 0696d9f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

core/rs/core/src/changes_vtab_write.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ fn did_cid_win(
9494
reset_cached_stmt(col_val_stmt.stmt)?;
9595
if ret == 0 && unsafe { (*ext_data).mergeEqualValues == 1 } {
9696
// values are the same (ret == 0) and the option to tie break on site_id is true
97-
let ret = did_site_id_win(
97+
let won = did_site_id_win(
9898
db,
9999
insert_tbl,
100100
tbl_info,
@@ -103,7 +103,7 @@ fn did_cid_win(
103103
insert_site_id,
104104
errmsg,
105105
)?;
106-
return Ok(ret);
106+
return Ok(won);
107107
}
108108
return Ok(ret > 0);
109109
}

0 commit comments

Comments
 (0)