diff --git a/rslib/src/dbcheck.rs b/rslib/src/dbcheck.rs
index a07fd1bcc..dc78e2bc2 100644
--- a/rslib/src/dbcheck.rs
+++ b/rslib/src/dbcheck.rs
@@ -330,7 +330,7 @@ impl Collection {
                     Ok(self.storage.get_note(nid)?.unwrap())
                 }
                 // other errors are unhandled
-                _ => return Err(err),
+                _ => Err(err),
             },
         }
     }
diff --git a/rslib/src/search/sqlwriter.rs b/rslib/src/search/sqlwriter.rs
index 5137255a2..47d43d0eb 100644
--- a/rslib/src/search/sqlwriter.rs
+++ b/rslib/src/search/sqlwriter.rs
@@ -133,9 +133,7 @@ impl SqlWriter<'_> {
             SearchNode::EditedInDays(days) => self.write_edited(*days)?,
             SearchNode::CardTemplate(template) => match template {
                 TemplateKind::Ordinal(_) => self.write_template(template)?,
-                TemplateKind::Name(name) => {
-                    self.write_template(&TemplateKind::Name(norm(name).into()))?
-                }
+                TemplateKind::Name(name) => self.write_template(&TemplateKind::Name(norm(name)))?,
             },
             SearchNode::Deck(deck) => self.write_deck(&norm(deck))?,
             SearchNode::NoteTypeID(ntid) => {
@@ -191,7 +189,7 @@ impl SqlWriter<'_> {
     }
 
     fn write_tag(&mut self, text: &str) -> Result<()> {
-        if text.contains(" ") {
+        if text.contains(' ') {
             write!(self.sql, "false").unwrap();
         } else {
             match text {
diff --git a/rslib/src/text.rs b/rslib/src/text.rs
index 0cfa814c7..d6117345f 100644
--- a/rslib/src/text.rs
+++ b/rslib/src/text.rs
@@ -298,7 +298,7 @@ pub(crate) fn to_custom_re<'a>(txt: &'a str, wildcard: &str) -> Cow<'a, str> {
 }
 
 /// Convert to SQL respecting Anki wildcards.
-pub(crate) fn to_sql<'a>(txt: &'a str) -> Cow<'a, str> {
+pub(crate) fn to_sql(txt: &str) -> Cow<str> {
     // escape sequences and unescaped special characters which need conversion
     lazy_static! {
         static ref RE: Regex = Regex::new(r"\\[\\*]|[*%]").unwrap();