Fix 1.74 clippy lints

Author: coolreader18

crates/cli/src/subcommands/repl.rs

@@ -17,30 +17,20 @@ use syntect::highlighting::{Theme, ThemeSet};
 use syntect::parsing::{SyntaxDefinition, SyntaxSet, SyntaxSetBuilder};
 use syntect::util::LinesWithEndings;
 
-static SQL_SYNTAX: &str = include_str!("../../tools/sublime/SpaceTimeDbSQL.sublime-syntax");
-static SYNTAX_NAME: &str = "SQL (SpaceTimeDb)";
-
-static AUTO_COMPLETE: &str = "\
-true
-false
-select
-from
-insert
-into
-values
-update,
-delete,
-create,
-where
-join
-sort by
-.exit
-.clear
-";
+const SQL_SYNTAX: &str = include_str!("../../tools/sublime/SpaceTimeDbSQL.sublime-syntax");
+const SYNTAX_NAME: &str = "SQL (SpaceTimeDb)";
+
+const AUTO_COMPLETE: &[&str] = &[
+    "true", "false", "select", "from", "insert", "into", "values", "update,", "delete,", "create,", "where", "join",
+    "sort by", ".exit", ".clear",
+];
 
 pub async fn exec(con: Connection) -> Result<(), anyhow::Error> {
     let database = con.database.clone();
-    let mut rl = Editor::<ReplHelper, DefaultHistory>::new().unwrap();
+    let rl_config = rustyline::Config::builder()
+        .completion_type(rustyline::config::CompletionType::List)
+        .build();
+    let mut rl = Editor::<ReplHelper, DefaultHistory>::with_config(rl_config)?;
     let history = home_dir().unwrap_or_else(temp_dir).join(".stdb.history.txt");
     if rl.load_history(&history).is_err() {
         eprintln!("No previous history.");
@@ -121,33 +111,22 @@ impl ReplHelper {
 impl Helper for ReplHelper {}
 
 impl Completer for ReplHelper {
-    type Candidate = String;
+    type Candidate = &'static str;
 
     fn complete(
         &self,
         line: &str,
         pos: usize,
         _: &rustyline::Context<'_>,
     ) -> rustyline::Result<(usize, Vec<Self::Candidate>)> {
-        let mut name = String::new();
-        let mut name_pos = pos;
-        while let Some(char) = line
-            .chars()
-            .nth(name_pos.wrapping_sub(1))
-            .filter(|c| c.is_ascii_alphanumeric() || ['_', '.'].contains(c))
-        {
-            name.push(char);
-            name_pos -= 1;
-        }
-        if name.is_empty() {
-            return Ok((0, vec![]));
-        }
-        name = name.chars().rev().collect();
+        let (name_pos, name) = rustyline::completion::extract_word(line, pos, None, |c| {
+            !(c.is_ascii_alphanumeric() || matches!(c, '_' | '.'))
+        });
 
-        let mut completions: Vec<_> = AUTO_COMPLETE.split('\n').map(str::to_string).collect();
-        completions = completions
+        let completions: Vec<_> = AUTO_COMPLETE
             .iter()
-            .filter_map(|it| it.starts_with(&name).then(|| it.clone()))
+            .copied()
+            .filter(|completion| completion.starts_with(name))
             .collect();
 
         Ok((name_pos, completions))
@@ -161,19 +140,11 @@ impl Hinter for ReplHelper {
         if line.len() > pos {
             return None;
         }
-        if let Ok((mut completion_pos, completions)) = self.complete(line, pos, ctx) {
-            if completions.is_empty() {
-                return None;
-            }
-            let mut hint = completions[0].clone();
-            while completion_pos < pos {
-                if hint.is_empty() {
-                    return None;
-                }
-                hint.remove(0);
-                completion_pos += 1;
+        if let Ok((completion_pos, completions)) = self.complete(line, pos, ctx) {
+            match &completions[..] {
+                [completion] => Some(completion[pos - completion_pos..].to_owned()),
+                _ => None,
             }
-            Some(hint)
         } else {
             None
         }

crates/client-api-messages/src/lib.rs

@@ -1 +1,4 @@
+// TODO: change the triple-slash comments to normal comments in the .proto
+#![allow(clippy::four_forward_slashes)]
+
 include!(concat!(env!("OUT_DIR"), "/protobuf.rs"));

crates/core/src/db/datastore/locking_tx_datastore/mod.rs

@@ -295,7 +295,7 @@ impl TxState {
     }
 
     pub fn get_or_create_delete_table(&mut self, table_id: TableId) -> &mut BTreeSet<RowId> {
-        self.delete_tables.entry(table_id).or_insert_with(BTreeSet::new)
+        self.delete_tables.entry(table_id).or_default()
     }
 
     /// When there's an index on `cols`,

crates/core/src/sql/ast.rs

@@ -176,12 +176,13 @@ impl From {
     pub fn find_field(&self, f: &str) -> Result<Vec<FieldDef>, RelationError> {
         let field = extract_table_field(f)?;
         let fields = self.iter_tables().flat_map(|t| {
-            t.columns.iter().filter_map(|column| {
-                (column.col_name == field.field).then(|| FieldDef {
+            t.columns
+                .iter()
+                .filter(|column| column.col_name == field.field)
+                .map(|column| FieldDef {
                     column: column.clone(),
                     table_name: field.table.unwrap_or(&t.table_name).to_string(),
                 })
-            })
         });
 
         Ok(fields.collect())

crates/data-structures/src/slim_slice.rs

@@ -1406,7 +1406,7 @@ impl Ord for SlimStr<'_> {
 impl PartialOrd for SlimStr<'_> {
     #[inline]
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.deref().partial_cmp(other.deref())
+        Some(self.cmp(other))
     }
 }
 impl PartialOrd<str> for SlimStr<'_> {
@@ -1585,7 +1585,7 @@ impl Ord for SlimStrMut<'_> {
 impl PartialOrd for SlimStrMut<'_> {
     #[inline]
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.deref().partial_cmp(other.deref())
+        Some(self.cmp(other))
     }
 }
 impl PartialOrd<str> for SlimStrMut<'_> {

crates/lib/src/lib.rs

@@ -155,15 +155,8 @@ impl TableDef {
         }
 
         // Multi-column indexes cannot be unique (yet), so just add them.
-        let multi_col_indexes = table.indexes.iter().filter_map(|index| {
-            (index.cols.len() > 1).then(|| {
-                spacetimedb_sats::db::def::IndexDef::new_cols(
-                    index.name.clone(),
-                    AUTO_TABLE_ID,
-                    false,
-                    index.cols.clone(),
-                )
-            })
+        let multi_col_indexes = table.indexes.iter().filter(|index| index.cols.len() > 1).map(|index| {
+            spacetimedb_sats::db::def::IndexDef::new_cols(index.name.clone(), AUTO_TABLE_ID, false, index.cols.clone())
         });
         indexes.extend(multi_col_indexes);
 

crates/sats/src/typespace.rs

@@ -49,7 +49,7 @@ impl IndexMut<AlgebraicTypeRef> for Typespace {
 }
 
 impl Typespace {
-    pub const EMPTY: &Typespace = &Self::new(Vec::new());
+    pub const EMPTY: &'static Typespace = &Self::new(Vec::new());
 
     /// Returns a context ([`Typespace`]) with the given `types`.
     pub const fn new(types: Vec<AlgebraicType>) -> Self {