Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions bottomless-cli/src/replicator_extras.rs
Original file line number Diff line number Diff line change
Expand Up @@ -382,9 +382,8 @@ impl Replicator {
let frame = tokio::fs::File::open(&obj).await?;
let frame_buf_reader = BufReader::new(frame);

let mut frameno = first_frame_no;
let mut reader = bottomless::read::BatchReader::new(
frameno,
first_frame_no,
frame_buf_reader,
page_size as usize,
compression_kind,
Expand All @@ -411,7 +410,6 @@ impl Replicator {
);
pending_pages.flush(db).await?;
}
frameno += 1;
Comment thread
AryanSuvarna marked this conversation as resolved.
last_received_frame_no += 1;
}
db.flush().await?;
Expand Down
2 changes: 1 addition & 1 deletion libsql-server/src/query_analysis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ impl StmtKind {
}
}

fn to_ascii_lower(s: &str) -> Cow<str> {
fn to_ascii_lower(s: &str) -> Cow<'_, str> {
if s.chars().all(|c| char::is_ascii_lowercase(&c)) {
Cow::Borrowed(s)
} else {
Expand Down
2 changes: 1 addition & 1 deletion libsql-sys/src/wal/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ impl PageHeaders {
Self { inner }
}

pub fn iter(&self) -> PageHdrIter {
pub fn iter(&self) -> PageHdrIter<'_> {
// TODO: move LIBSQL_PAGE_SIZE
PageHdrIter::new(self.as_ptr(), 4096)
}
Expand Down
2 changes: 1 addition & 1 deletion libsql/src/hrana/cursor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ where
})
}

pub async fn next_step(&mut self) -> Result<CursorStep<S>> {
pub async fn next_step(&mut self) -> Result<CursorStep<'_, S>> {
CursorStep::new(self).await
}

Expand Down
2 changes: 1 addition & 1 deletion libsql/src/hrana/hyper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ impl crate::statement::Stmt for crate::hrana::Statement<HttpSender> {
self.cols.len()
}

fn columns(&self) -> Vec<crate::Column> {
fn columns(&self) -> Vec<crate::Column<'_>> {
//FIXME: there are several blockers here:
// 1. We cannot know the column types before sending a query, so this method will never return results right
// away.
Expand Down
2 changes: 1 addition & 1 deletion libsql/src/local/impls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ impl Stmt for LibsqlStmt {
self.0.column_count()
}

fn columns(&self) -> Vec<Column> {
fn columns(&self) -> Vec<Column<'_>> {
self.0.columns()
}
}
Expand Down
2 changes: 1 addition & 1 deletion libsql/src/local/statement.rs
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ impl Statement {
/// If associated DB schema can be altered concurrently, you should make
/// sure that current statement has already been stepped once before
/// calling this method.
pub fn columns(&self) -> Vec<Column> {
pub fn columns(&self) -> Vec<Column<'_>> {
let n = self.column_count();
let mut cols = Vec::with_capacity(n);
for i in 0..n {
Expand Down
2 changes: 1 addition & 1 deletion libsql/src/replication/connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ impl Stmt for RemoteStatement {
}
}

fn columns(&self) -> Vec<Column> {
fn columns(&self) -> Vec<Column<'_>> {
if let Some(stmt) = self.local_statement.as_ref() {
return stmt.columns();
}
Expand Down
4 changes: 2 additions & 2 deletions libsql/src/statement.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pub(crate) trait Stmt {

fn column_count(&self) -> usize;

fn columns(&self) -> Vec<Column>;
fn columns(&self) -> Vec<Column<'_>>;
}

/// A cached prepared statement.
Expand Down Expand Up @@ -103,7 +103,7 @@ impl Statement {
}

/// Fetch the list of columns for the prepared statement.
pub fn columns(&self) -> Vec<Column> {
pub fn columns(&self) -> Vec<Column<'_>> {
self.inner.columns()
}
}
2 changes: 1 addition & 1 deletion libsql/src/sync/statement.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ impl Stmt for SyncedStatement {
self.inner.column_count()
}

fn columns(&self) -> Vec<Column> {
fn columns(&self) -> Vec<Column<'_>> {
self.inner.columns()
}
}
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
profile = "default"
channel = "1.85.0"
channel = "1.98.1"
2 changes: 1 addition & 1 deletion vendored/rusqlite/src/column.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ impl Statement<'_> {
/// calling this method.
#[cfg(feature = "column_decltype")]
#[cfg_attr(docsrs, doc(cfg(feature = "column_decltype")))]
pub fn columns(&self) -> Vec<Column> {
pub fn columns(&self) -> Vec<Column<'_>> {
let n = self.column_count();
let mut cols = Vec::with_capacity(n);
for i in 0..n {
Expand Down
Loading