fix: ci

Author: psteinroe

crates/pg_completions/src/context.rs

@@ -29,7 +29,7 @@ impl TryFrom<&str> for ClauseType {
                     panic!("{}", message);
                 }
 
-                return Err(message);
+                Err(message)
             }
         }
     }
@@ -215,7 +215,7 @@ mod tests {
 
             let params = crate::CompletionParams {
                 position: (position as u32).into(),
-                text: text,
+                text,
                 tree: Some(&tree),
                 schema: &pg_schema_cache::SchemaCache::new(),
             };
@@ -247,7 +247,7 @@ mod tests {
             let tree = get_tree(text.as_str());
             let params = crate::CompletionParams {
                 position: (position as u32).into(),
-                text: text,
+                text,
                 tree: Some(&tree),
                 schema: &pg_schema_cache::SchemaCache::new(),
             };
@@ -281,7 +281,7 @@ mod tests {
             let tree = get_tree(text.as_str());
             let params = crate::CompletionParams {
                 position: (position as u32).into(),
-                text: text,
+                text,
                 tree: Some(&tree),
                 schema: &pg_schema_cache::SchemaCache::new(),
             };
@@ -306,14 +306,14 @@ mod tests {
 
             let params = crate::CompletionParams {
                 position: (position as u32).into(),
-                text: text,
+                text,
                 tree: Some(&tree),
                 schema: &pg_schema_cache::SchemaCache::new(),
             };
 
             let ctx = CompletionContext::new(&params);
 
-            let node = ctx.ts_node.map(|n| n.clone()).unwrap();
+            let node = ctx.ts_node.unwrap();
 
             assert_eq!(ctx.get_ts_node_content(node), Some("select"));
 
@@ -334,14 +334,14 @@ mod tests {
 
         let params = crate::CompletionParams {
             position: (position as u32).into(),
-            text: text,
+            text,
             tree: Some(&tree),
             schema: &pg_schema_cache::SchemaCache::new(),
         };
 
         let ctx = CompletionContext::new(&params);
 
-        let node = ctx.ts_node.map(|n| n.clone()).unwrap();
+        let node = ctx.ts_node.unwrap();
 
         assert_eq!(ctx.get_ts_node_content(node), Some("from"));
         assert_eq!(
@@ -360,14 +360,14 @@ mod tests {
 
         let params = crate::CompletionParams {
             position: (position as u32).into(),
-            text: text,
+            text,
             tree: Some(&tree),
             schema: &pg_schema_cache::SchemaCache::new(),
         };
 
         let ctx = CompletionContext::new(&params);
 
-        let node = ctx.ts_node.map(|n| n.clone()).unwrap();
+        let node = ctx.ts_node.unwrap();
 
         assert_eq!(ctx.get_ts_node_content(node), Some(""));
         assert_eq!(ctx.wrapping_clause_type, None);
@@ -385,14 +385,14 @@ mod tests {
 
         let params = crate::CompletionParams {
             position: (position as u32).into(),
-            text: text,
+            text,
             tree: Some(&tree),
             schema: &pg_schema_cache::SchemaCache::new(),
         };
 
         let ctx = CompletionContext::new(&params);
 
-        let node = ctx.ts_node.map(|n| n.clone()).unwrap();
+        let node = ctx.ts_node.unwrap();
 
         assert_eq!(ctx.get_ts_node_content(node), Some("fro"));
         assert_eq!(ctx.wrapping_clause_type, Some(ClauseType::Select));

crates/pg_completions/src/test_helper.rs

@@ -34,10 +34,8 @@ pub(crate) async fn get_test_deps(
 pub(crate) fn get_text_and_position(sql: &str) -> (usize, String) {
     // the cursor is to the left of the `CURSOR_POS`
     let position = sql
-        .find(|c| c == CURSOR_POS)
-        .expect("Please insert the CURSOR_POS into your query.")
-        .checked_sub(1)
-        .unwrap_or(0);
+        .find(CURSOR_POS)
+        .expect("Please insert the CURSOR_POS into your query.").saturating_sub(1);
 
     let text = sql.replace(CURSOR_POS, "");
 

crates/pg_lsp/src/db_connection.rs

@@ -40,7 +40,7 @@ impl DbConnection {
                     res = listener.recv() => {
                         match res {
                             Ok(not) => {
-                                if not.payload().to_string() == "reload schema" {
+                                if not.payload() == "reload schema" {
                                     let schema_cache = SchemaCache::load(&cloned_pool).await.unwrap();
                                     ide.write().await.set_schema_cache(schema_cache);
                                 };

crates/pg_lsp/src/session.rs

@@ -248,8 +248,7 @@ impl Session {
             tree: ide
                 .tree_sitter
                 .tree(&stmt)
-                .as_ref()
-                .and_then(|t| Some(t.as_ref())),
+                .as_ref().map(|t| t.as_ref()),
             schema: &schema_cache,
         })
         .into_iter()

crates/pg_schema_cache/src/columns.rs

@@ -148,27 +148,27 @@ mod tests {
             user_id_col.default_expr,
             Some("nextval('users_id_seq'::regclass)".into())
         );
-        assert_eq!(user_id_col.is_nullable, false);
-        assert_eq!(user_id_col.is_primary_key, true);
-        assert_eq!(user_id_col.is_unique, true);
+        assert!(!user_id_col.is_nullable);
+        assert!(user_id_col.is_primary_key);
+        assert!(user_id_col.is_unique);
         assert_eq!(user_id_col.varchar_length, None);
 
         let user_name_col = cache.find_col("name", "users", None).unwrap();
         assert_eq!(user_name_col.class_kind, ColumnClassKind::OrdinaryTable);
         assert_eq!(user_name_col.comment, None);
         assert_eq!(user_name_col.default_expr, None);
-        assert_eq!(user_name_col.is_nullable, false);
-        assert_eq!(user_name_col.is_primary_key, false);
-        assert_eq!(user_name_col.is_unique, false);
+        assert!(!user_name_col.is_nullable);
+        assert!(!user_name_col.is_primary_key);
+        assert!(!user_name_col.is_unique);
         assert_eq!(user_name_col.varchar_length, Some(255));
 
         let user_is_veg_col = cache.find_col("is_vegetarian", "users", None).unwrap();
         assert_eq!(user_is_veg_col.class_kind, ColumnClassKind::OrdinaryTable);
         assert_eq!(user_is_veg_col.comment, None);
         assert_eq!(user_is_veg_col.default_expr, Some("false".into()));
-        assert_eq!(user_is_veg_col.is_nullable, true);
-        assert_eq!(user_is_veg_col.is_primary_key, false);
-        assert_eq!(user_is_veg_col.is_unique, false);
+        assert!(user_is_veg_col.is_nullable);
+        assert!(!user_is_veg_col.is_primary_key);
+        assert!(!user_is_veg_col.is_unique);
         assert_eq!(user_is_veg_col.varchar_length, None);
 
         let user_middle_name_col = cache.find_col("middle_name", "users", None).unwrap();
@@ -178,9 +178,9 @@ mod tests {
         );
         assert_eq!(user_middle_name_col.comment, None);
         assert_eq!(user_middle_name_col.default_expr, None);
-        assert_eq!(user_middle_name_col.is_nullable, true);
-        assert_eq!(user_middle_name_col.is_primary_key, false);
-        assert_eq!(user_middle_name_col.is_unique, false);
+        assert!(user_middle_name_col.is_nullable);
+        assert!(!user_middle_name_col.is_primary_key);
+        assert!(!user_middle_name_col.is_unique);
         assert_eq!(user_middle_name_col.varchar_length, Some(255));
 
         let properties_owner_id_col = cache
@@ -194,9 +194,9 @@ mod tests {
             properties_owner_id_col.comment,
             Some("users might own many houses".into())
         );
-        assert_eq!(properties_owner_id_col.is_nullable, true);
-        assert_eq!(properties_owner_id_col.is_primary_key, false);
-        assert_eq!(properties_owner_id_col.is_unique, false);
+        assert!(properties_owner_id_col.is_nullable);
+        assert!(!properties_owner_id_col.is_primary_key);
+        assert!(!properties_owner_id_col.is_unique);
         assert_eq!(properties_owner_id_col.varchar_length, None);
     }
 }

crates/pg_workspace_new/src/workspace/server/pg_query.rs

@@ -1,9 +1,8 @@
 use std::sync::Arc;
 
 use dashmap::DashMap;
-use pg_diagnostics::{serde::Diagnostic as SDiagnostic, Diagnostic, MessageAndDescription};
+use pg_diagnostics::serde::Diagnostic as SDiagnostic;
 use pg_query_ext::diagnostics::*;
-use text_size::TextRange;
 
 use super::{
     change::ChangedStatement,