Merge pull request #352 from psarna/clippy5823

chore: apply clippy fixes

crates/core/src/connection.rs

@@ -15,7 +15,7 @@ pub struct Connection {
 
 impl Drop for Connection {
     fn drop(&mut self) {
-        if let Some(_) = Arc::get_mut(&mut self.drop_ref) {
+        if Arc::get_mut(&mut self.drop_ref).is_some() {
             unsafe { libsql_sys::ffi::sqlite3_close(self.raw) };
         }
     }

crates/core/src/database.rs

@@ -35,7 +35,7 @@ impl Opts {
         let endpoint = endpoint.into().replace("libsql://", "https://");
         Opts {
             sync: Sync::Http {
-                endpoint: endpoint.into(),
+                endpoint,
                 auth_token: auth_token.into(),
             },
         }

crates/core/src/errors.rs

@@ -44,6 +44,7 @@ pub fn error_from_code(code: i32) -> String {
     sqlite_errmsg_to_string(errmsg)
 }
 
+#[allow(clippy::not_unsafe_ptr_arg_deref)]
 pub fn sqlite_errmsg_to_string(errmsg: *const std::ffi::c_char) -> String {
     let errmsg = unsafe { std::ffi::CStr::from_ptr(errmsg) }.to_bytes();
     String::from_utf8_lossy(errmsg).to_string()

crates/core/src/params.rs

@@ -132,7 +132,7 @@ impl From<libsql_sys::Value> for Value {
 
                 let slice: &[u8] =
                     unsafe { std::slice::from_raw_parts(blob as *const u8, len as usize) };
-                v.extend_from_slice(&slice);
+                v.extend_from_slice(slice);
                 Value::Blob(v)
             }
         }

crates/core/src/rows.rs

@@ -64,8 +64,10 @@ impl Rows {
             _ => Err(Error::UnknownColumnType(idx, val)),
         }
     }
+}
 
-    pub fn as_ref(&self) -> &Statement {
+impl AsRef<Statement> for Rows {
+    fn as_ref(&self) -> &Statement {
         &self.stmt
     }
 }

crates/core/src/statement.rs

@@ -134,7 +134,7 @@ impl Statement {
                 self.inner.bind_text(i, value);
             }
             ValueRef::Blob(value) => {
-                self.inner.bind_blob(i, &value[..]);
+                self.inner.bind_blob(i, value);
             }
         }
     }

crates/core/src/v2/hrana.rs

@@ -396,8 +396,7 @@ impl RowsInner for Rows {
     fn column_name(&self, idx: i32) -> Option<&str> {
         self.cols
             .get(idx as usize)
-            .map(|c| c.name.as_ref())
-            .flatten()
+            .and_then(|c| c.name.as_ref())
             .map(|s| s.as_str())
     }
 
@@ -420,12 +419,11 @@ impl RowInner for Row {
     fn column_name(&self, idx: i32) -> Option<&str> {
         self.cols
             .get(idx as usize)
-            .map(|c| c.name.as_ref())
-            .flatten()
+            .and_then(|c| c.name.as_ref())
             .map(|s| s.as_str())
     }
 
-    fn column_str(&self, idx: i32) -> Result<&str> {
+    fn column_str(&self, _idx: i32) -> Result<&str> {
         todo!()
     }
 

crates/core/src/v2/rows.rs

@@ -17,6 +17,7 @@ pub struct Rows {
 }
 
 impl Rows {
+    #[allow(clippy::should_implement_trait)]
     pub fn next(&mut self) -> Result<Option<Row>> {
         self.inner.next()
     }
@@ -96,7 +97,7 @@ pub trait FromValue {
 
 impl FromValue for crate::Value {
     fn from_sql(val: Value) -> Result<Self> {
-        Ok(val.into())
+        Ok(val)
     }
 }
 
@@ -124,7 +125,7 @@ impl FromValue for i64 {
     fn from_sql(val: Value) -> Result<Self> {
         match val {
             Value::Null => Err(crate::Error::NullValue),
-            Value::Integer(i) => Ok(i as i64),
+            Value::Integer(i) => Ok(i),
             _ => unreachable!("invalid value type"),
         }
     }
@@ -144,7 +145,7 @@ impl FromValue for f64 {
     fn from_sql(val: Value) -> Result<Self> {
         match val {
             Value::Null => Err(crate::Error::NullValue),
-            Value::Real(f) => Ok(f as f64),
+            Value::Real(f) => Ok(f),
             _ => unreachable!("invalid value type"),
         }
     }

crates/replication/src/lib.rs

@@ -12,12 +12,6 @@ pub use frame::{Frame, FrameHeader};
 pub use replica::hook::{Frames, InjectorHookCtx};
 use replica::snapshot::SnapshotFileHeader;
 pub use replica::snapshot::TempSnapshot;
-use tonic::codegen::InterceptedService;
-use tonic::metadata::{Ascii, MetadataValue};
-use tonic::service::Interceptor;
-// use tonic::transport::Channel;
-
-use uuid::Uuid;
 
 use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::Arc;
@@ -197,7 +191,7 @@ impl Replicator {
         Ok(())
     }
 
-    pub async fn delegate_write(&self, sql: &str) -> anyhow::Result<()> {
+    pub async fn delegate_write(&self, _sql: &str) -> anyhow::Result<()> {
         // let req =
         Ok(())
     }