aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-04 15:54:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Autofix clippy issues with cargo fix --clippy

Browse Source
This commit is contained in:
Lauri Virtanen
2024-11-24 19:27:01 +02:00
parent aa4dd5c8e7
commit a7100d8e9b
9 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bindings/wasm/lib.rs
View File

@@ -57,10 +57,7 @@ impl Statement {
#[wasm_bindgen]
pub fn raw(mut self, toggle: Option<bool>) -> Self {
self.raw = match toggle {
Some(toggle) => toggle,
None => true,
};
self.raw = toggle.unwrap_or(true);
self
}

2
core/io/linux.rs
View File

@@ -70,7 +70,7 @@ impl LinuxIO {
}
impl InnerLinuxIO {
pub fn get_iovec<'a>(&'a mut self, buf: *const u8, len: usize) -> &'a iovec {
pub fn get_iovec(&mut self, buf: *const u8, len: usize) -> &iovec {
let iovec = &mut self.iovecs[self.next_iovec];
iovec.iov_base = buf as *mut std::ffi::c_void;
iovec.iov_len = len;

14
core/lib.rs
View File

@@ -187,7 +187,7 @@ impl Connection {
match cmd {
Cmd::Stmt(stmt) => {
let program = Rc::new(translate::translate(
&*self.schema.borrow(),
&self.schema.borrow(),
stmt,
self.header.clone(),
self.pager.clone(),
@@ -212,18 +212,18 @@ impl Connection {
match cmd {
Cmd::Stmt(stmt) => {
let program = Rc::new(translate::translate(
&*self.schema.borrow(),
&self.schema.borrow(),
stmt,
self.header.clone(),
self.pager.clone(),
Rc::downgrade(&self),
Rc::downgrade(self),
)?);
let stmt = Statement::new(program, self.pager.clone());
Ok(Some(Rows { stmt }))
}
Cmd::Explain(stmt) => {
let program = translate::translate(
&*self.schema.borrow(),
&self.schema.borrow(),
stmt,
self.header.clone(),
self.pager.clone(),
@@ -235,7 +235,7 @@ impl Connection {
Cmd::ExplainQueryPlan(stmt) => {
match stmt {
ast::Stmt::Select(select) => {
let plan = prepare_select_plan(&*self.schema.borrow(), select)?;
let plan = prepare_select_plan(&self.schema.borrow(), select)?;
let (plan, _) = optimize_plan(plan)?;
println!("{}", plan);
}
@@ -257,7 +257,7 @@ impl Connection {
match cmd {
Cmd::Explain(stmt) => {
let program = translate::translate(
&*self.schema.borrow(),
&self.schema.borrow(),
stmt,
self.header.clone(),
self.pager.clone(),
@@ -268,7 +268,7 @@ impl Connection {
Cmd::ExplainQueryPlan(_stmt) => todo!(),
Cmd::Stmt(stmt) => {
let program = translate::translate(
&*self.schema.borrow(),
&self.schema.borrow(),
stmt,
self.header.clone(),
self.pager.clone(),

8
core/storage/btree.rs
View File

@@ -273,7 +273,7 @@ impl BTreeCursor {
}
}
if cell_idx >= contents.cell_count() + 1 {
if cell_idx > contents.cell_count() {
// end
let has_parent = self.stack.current() > 0;
if has_parent {
@@ -876,7 +876,7 @@ impl BTreeCursor {
.insert(overflow_cell.index, to_static_buf(&overflow_cell.payload));
}
*self.write_info.rightmost_pointer.borrow_mut() =
page_copy.rightmost_pointer().clone();
page_copy.rightmost_pointer();
self.write_info.page_copy.replace(Some(page_copy));
@@ -1222,7 +1222,7 @@ impl BTreeCursor {
fn allocate_page(&self, page_type: PageType, offset: usize) -> Rc<RefCell<Page>> {
let page = self.pager.allocate_page().unwrap();
btree_init_page(&page, page_type, &*self.database_header.borrow(), offset);
btree_init_page(&page, page_type, &self.database_header.borrow(), offset);
page
}
@@ -1423,7 +1423,7 @@ impl BTreeCursor {
// return SQLITE_CORRUPT_PAGE(pPage);
// }
// don't count header and cell pointers?
nfree = nfree - first_cell as usize;
nfree -= first_cell as usize;
nfree as u16
}

1
core/storage/sqlite3_ondisk.rs
View File

@@ -48,7 +48,6 @@ use crate::storage::database::DatabaseStorage;
use crate::storage::pager::{Page, Pager};
use crate::types::{OwnedRecord, OwnedValue};
use crate::{File, Result};
use cfg_block::cfg_block;
use log::trace;
use std::cell::RefCell;
use std::pin::Pin;

6
core/storage/wal.rs
View File

@@ -159,7 +159,7 @@ impl Wal for WalFile {
&page,
db_size,
write_counter,
&*header,
&header,
checksums,
)?;
self.last_checksum.replace(checksums);
@@ -235,9 +235,9 @@ impl Wal for WalFile {
}
if *self.syncing.borrow() {
return Ok(CheckpointStatus::IO);
Ok(CheckpointStatus::IO)
} else {
return Ok(CheckpointStatus::Done);
Ok(CheckpointStatus::Done)
}
}
}

2
core/vdbe/mod.rs
View File

@@ -2227,7 +2227,7 @@ impl Program {
let rows = Rows { stmt };
let mut schema = RefCell::borrow_mut(&conn.schema);
// TODO: This function below is synchronous, make it not async
parse_schema_rows(Some(rows), &mut *schema, conn.pager.io.clone())?;
parse_schema_rows(Some(rows), &mut schema, conn.pager.io.clone())?;
state.pc += 1;
}
}

7
simulator/main.rs
View File

@@ -1,5 +1,4 @@
use limbo_core::{Connection, Database, File, OpenFlags, PlatformIO, Result, RowResult, IO};
use log;
use rand::prelude::*;
use rand_chacha::ChaCha8Rng;
use std::cell::RefCell;
@@ -279,7 +278,7 @@ fn gen_random_text(env: &mut SimulatorEnv) -> String {
let size = env.rng.gen_range(1024..max_size);
let mut name = String::new();
for i in 0..size {
name.push(((i % 26) as u8 + 'A' as u8) as char);
name.push(((i % 26) as u8 + b'A') as char);
}
name
} else {
@@ -527,7 +526,7 @@ impl limbo_core::File for SimulatorFile {
}
fn size(&self) -> Result<u64> {
Ok(self.inner.size()?)
self.inner.size()
}
}
@@ -573,7 +572,7 @@ impl Value {
Value::Integer(i) => i.to_string(),
Value::Float(f) => f.to_string(),
Value::Text(t) => format!("'{}'", t.clone()),
Value::Blob(vec) => to_sqlite_blob(&vec),
Value::Blob(vec) => to_sqlite_blob(vec),
}
}
}

7
test/src/lib.rs
View File

@@ -340,8 +340,8 @@ mod tests {
log::debug!("counting");
let list_query = "SELECT count(x) FROM test";
loop {
match conn.query(list_query).unwrap() {
Some(ref mut rows) => loop {
if let Some(ref mut rows) = conn.query(list_query).unwrap() {
loop {
match rows.next_row()? {
RowResult::Row(row) => {
let first_value = &row.values[0];
@@ -357,8 +357,7 @@ mod tests {
}
RowResult::Done => break,
}
},
None => {}
}
}
}
}