Fix warnings

Author: Jake-Shadle

crates/corro-agent/src/api/public/mod.rs

@@ -704,16 +704,14 @@ pub async fn api_v1_table_stats(
 
 #[cfg(test)]
 mod tests {
-    use bytes::Bytes;
     use corro_types::{
         api::RowId,
         base::CrsqlDbVersion,
         broadcast::{BroadcastInput, BroadcastV1, ChangeV1, Changeset},
         config::Config,
         schema::SqliteType,
     };
-    use futures::Stream;
-    use http_body::{combinators::UnsyncBoxBody, Body};
+    use http_body::Body;
     use tokio::sync::mpsc::error::TryRecvError;
     use tokio_util::codec::{Decoder, LinesCodec};
     use tripwire::Tripwire;
@@ -722,19 +720,6 @@ mod tests {
 
     use crate::agent::setup;
 
-    struct UnsyncBodyStream(std::pin::Pin<Box<UnsyncBoxBody<Bytes, axum::Error>>>);
-
-    impl Stream for UnsyncBodyStream {
-        type Item = Result<Bytes, axum::Error>;
-
-        fn poll_next(
-            mut self: std::pin::Pin<&mut Self>,
-            cx: &mut std::task::Context<'_>,
-        ) -> std::task::Poll<Option<Self::Item>> {
-            self.0.as_mut().poll_data(cx)
-        }
-    }
-
     #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
     async fn test_api_db_execute() -> eyre::Result<()> {
         _ = tracing_subscriber::fmt::try_init();

crates/corro-api-types/src/lib.rs

@@ -511,7 +511,7 @@ impl SqliteValue {
         }
     }
 
-    pub fn as_ref(&self) -> SqliteValueRef {
+    pub fn as_ref(&self) -> SqliteValueRef<'_> {
         match self {
             SqliteValue::Null => SqliteValueRef(ValueRef::Null),
             SqliteValue::Integer(i) => SqliteValueRef(ValueRef::Integer(*i)),

crates/corro-pg/src/lib.rs

@@ -2554,7 +2554,7 @@ enum ParamKind<'a> {
     Positional,
 }
 
-fn as_param(expr: &Expr) -> Option<ParamKind> {
+fn as_param(expr: &Expr) -> Option<ParamKind<'_>> {
     if let Expr::Variable(name) = expr {
         if name.is_empty() {
             Some(ParamKind::Positional)
@@ -2595,7 +2595,7 @@ enum SqliteName {
     DoublyQualified(Name, Name, Name),
 }
 
-fn expr_to_name(expr: &Expr) -> Option<SqliteNameRef> {
+fn expr_to_name(expr: &Expr) -> Option<SqliteNameRef<'_>> {
     match expr {
         Expr::Id(id) => Some(SqliteNameRef::Id(id)),
         Expr::Name(name) => Some(SqliteNameRef::Name(name)),

crates/corro-types/src/agent.rs

@@ -1578,23 +1578,23 @@ impl Bookie {
         &self,
         label: &'static str,
         extra: E,
-    ) -> CountedTokioRwLockReadGuard<BookieInner> {
+    ) -> CountedTokioRwLockReadGuard<'_, BookieInner> {
         self.0.read(label, extra).await
     }
 
     pub async fn write<C: fmt::Display, E: Into<Option<C>>>(
         &self,
         label: &'static str,
         extra: E,
-    ) -> CountedTokioRwLockWriteGuard<BookieInner> {
+    ) -> CountedTokioRwLockWriteGuard<'_, BookieInner> {
         self.0.write(label, extra).await
     }
 
     pub fn blocking_write<C: fmt::Display, E: Into<Option<C>>>(
         &self,
         label: &'static str,
         extra: E,
-    ) -> CountedTokioRwLockWriteGuard<BookieInner> {
+    ) -> CountedTokioRwLockWriteGuard<'_, BookieInner> {
         self.0.blocking_write(label, extra)
     }
 

crates/corro-types/src/pubsub.rs

@@ -278,7 +278,7 @@ impl Handle for MatcherHandle {
         self.inner.id
     }
 
-    fn cancelled(&self) -> WaitForCancellationFuture {
+    fn cancelled(&self) -> WaitForCancellationFuture<'_> {
         self.inner.cancel.cancelled()
     }
 
@@ -2393,7 +2393,7 @@ pub enum UnpackError {
     Misuse,
 }
 
-pub fn unpack_columns(mut buf: &[u8]) -> Result<Vec<SqliteValueRef>, UnpackError> {
+pub fn unpack_columns(mut buf: &[u8]) -> Result<Vec<SqliteValueRef<'_>>, UnpackError> {
     let mut ret = vec![];
     let num_columns = buf.get_u8();
 

crates/corro-types/src/sqlite.rs

@@ -72,7 +72,7 @@ impl CrConn {
         Ok(Self(conn))
     }
 
-    pub fn immediate_transaction(&mut self) -> rusqlite::Result<Transaction> {
+    pub fn immediate_transaction(&mut self) -> rusqlite::Result<Transaction<'_>> {
         self.0
             .transaction_with_behavior(rusqlite::TransactionBehavior::Immediate)
     }

crates/corro-types/src/updates.rs

@@ -35,7 +35,7 @@ pub trait Manager<H> {
 #[async_trait]
 pub trait Handle {
     fn id(&self) -> Uuid;
-    fn cancelled(&self) -> WaitForCancellationFuture;
+    fn cancelled(&self) -> WaitForCancellationFuture<'_>;
     fn filter_matchable_change(
         &self,
         candidates: &mut MatchCandidates,
@@ -85,7 +85,7 @@ impl Handle for UpdateHandle {
         self.inner.id
     }
 
-    fn cancelled(&self) -> WaitForCancellationFuture {
+    fn cancelled(&self) -> WaitForCancellationFuture<'_> {
         self.inner.cancel.cancelled()
     }
 

crates/sqlite-pool/src/lib.rs

@@ -157,7 +157,10 @@ where
         res
     }
 
-    pub fn prepare(&self, sql: &str) -> Result<InterruptibleStatement<Statement>, rusqlite::Error> {
+    pub fn prepare(
+        &self,
+        sql: &str,
+    ) -> Result<InterruptibleStatement<Statement<'_>>, rusqlite::Error> {
         let stmt = self.conn.prepare(sql)?;
         self.current_sql.store(Arc::new(Some(sql.to_string())));
         Ok(InterruptibleStatement::new(
@@ -171,7 +174,7 @@ where
     pub fn prepare_cached(
         &self,
         sql: &str,
-    ) -> Result<InterruptibleStatement<CachedStatement>, rusqlite::Error> {
+    ) -> Result<InterruptibleStatement<CachedStatement<'_>>, rusqlite::Error> {
         let stmt = self.conn.prepare_cached(sql)?;
         self.current_sql.store(Arc::new(Some(sql.to_string())));
         Ok(InterruptibleStatement::new(