diff --git a/helix-core/src/surround.rs b/helix-core/src/surround.rs
index f430aee8a..b96cce5a0 100644
--- a/helix-core/src/surround.rs
+++ b/helix-core/src/surround.rs
@@ -397,15 +397,10 @@ fn rope_with_selections_and_expectations(
 
         let selections: SmallVec<[Range; 1]> = spec
             .match_indices('^')
-            .into_iter()
             .map(|(i, _)| Range::point(i))
             .collect();
 
-        let expectations: Vec<usize> = spec
-            .match_indices('_')
-            .into_iter()
-            .map(|(i, _)| i)
-            .collect();
+        let expectations: Vec<usize> = spec.match_indices('_').map(|(i, _)| i).collect();
 
         (rope, Selection::new(selections, 0), expectations)
     }
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 6514b40f5..005e985de 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -187,9 +187,12 @@ fn visit_map<M>(self, mut map: M) -> Result<Self::Value, M::Error>
                 M: serde::de::MapAccess<'de>,
             {
                 match map.next_entry::<String, String>()? {
-                    Some((key, suffix)) if key == "suffix" => Ok(FileType::Suffix(
-                        suffix.replace('/', &std::path::MAIN_SEPARATOR.to_string()),
-                    )),
+                    Some((key, suffix)) if key == "suffix" => Ok(FileType::Suffix({
+                        // FIXME: use `suffix.replace('/', std::path::MAIN_SEPARATOR_STR)`
+                        //        if MSRV is updated to 1.68
+                        let mut seperator = [0; 1];
+                        suffix.replace('/', std::path::MAIN_SEPARATOR.encode_utf8(&mut seperator))
+                    })),
                     Some((key, _value)) => Err(serde::de::Error::custom(format!(
                         "unknown key in `file-types` list: {}",
                         key
diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs
index 6c7169758..ad4ad899d 100644
--- a/helix-loader/src/lib.rs
+++ b/helix-loader/src/lib.rs
@@ -209,6 +209,24 @@ fn get_name(v: &Value) -> Option<&str> {
     }
 }
 
+/// Finds the current workspace folder.
+/// Used as a ceiling dir for LSP root resolution, the filepicker and potentially as a future filewatching root
+///
+/// This function starts searching the FS upward from the CWD
+/// and returns the first directory that contains either `.git` or `.helix`.
+/// If no workspace was found returns (CWD, true).
+/// Otherwise (workspace, false) is returned
+pub fn find_workspace() -> (PathBuf, bool) {
+    let current_dir = std::env::current_dir().expect("unable to determine current directory");
+    for ancestor in current_dir.ancestors() {
+        if ancestor.join(".git").exists() || ancestor.join(".helix").exists() {
+            return (ancestor.to_owned(), false);
+        }
+    }
+
+    (current_dir, true)
+}
+
 #[cfg(test)]
 mod merge_toml_tests {
     use std::str;
@@ -281,21 +299,3 @@ fn language_toml_nested_array_merges() {
         )
     }
 }
-
-/// Finds the current workspace folder.
-/// Used as a ceiling dir for LSP root resolution, the filepicker and potentially as a future filewatching root
-///
-/// This function starts searching the FS upward from the CWD
-/// and returns the first directory that contains either `.git` or `.helix`.
-/// If no workspace was found returns (CWD, true).
-/// Otherwise (workspace, false) is returned
-pub fn find_workspace() -> (PathBuf, bool) {
-    let current_dir = std::env::current_dir().expect("unable to determine current directory");
-    for ancestor in current_dir.ancestors() {
-        if ancestor.join(".git").exists() || ancestor.join(".helix").exists() {
-            return (ancestor.to_owned(), false);
-        }
-    }
-
-    (current_dir, true)
-}
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index fd8e8fb21..1ecbc8cc1 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -103,7 +103,7 @@ pub fn render_view(
 
         // Set DAP highlights, if needed.
         if let Some(frame) = editor.current_stack_frame() {
-            let dap_line = frame.line.saturating_sub(1) as usize;
+            let dap_line = frame.line.saturating_sub(1);
             let style = theme.get("ui.highlight.frameline");
             let line_decoration = move |renderer: &mut TextRenderer, pos: LinePos| {
                 if pos.doc_line != dap_line {
diff --git a/helix-tui/src/buffer.rs b/helix-tui/src/buffer.rs
index 8e0b0adf9..93e9fcf9b 100644
--- a/helix-tui/src/buffer.rs
+++ b/helix-tui/src/buffer.rs
@@ -442,7 +442,7 @@ pub fn set_spans_truncated(&mut self, x: u16, y: u16, spans: &Spans, width: u16)
         let mut x_offset = x as usize;
         let max_offset = min(self.area.right(), width.saturating_add(x));
         let mut start_index = self.index_of(x, y);
-        let mut index = self.index_of(max_offset as u16, y);
+        let mut index = self.index_of(max_offset, y);
 
         let content_width = spans.width();
         let truncated = content_width > width as usize;
diff --git a/helix-view/src/clipboard.rs b/helix-view/src/clipboard.rs
index d43d632a9..d639902f7 100644
--- a/helix-view/src/clipboard.rs
+++ b/helix-view/src/clipboard.rs
@@ -68,7 +68,7 @@ macro_rules! command_provider {
 
 #[cfg(windows)]
 pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
-    Box::new(provider::WindowsProvider::default())
+    Box::<provider::WindowsProvider>::default()
 }
 
 #[cfg(target_os = "macos")]
diff --git a/helix-view/src/tree.rs b/helix-view/src/tree.rs
index e8afd2045..4c9eba0fd 100644
--- a/helix-view/src/tree.rs
+++ b/helix-view/src/tree.rs
@@ -728,12 +728,11 @@ fn find_split_in_direction() {
         tree.focus = l0;
         let view = View::new(DocumentId::default(), GutterConfig::default());
         tree.split(view, Layout::Vertical);
-        let l2 = tree.focus;
 
         // Tree in test
         // | L0  | L2 |    |
         // |    L1    | R0 |
-        tree.focus = l2;
+        let l2 = tree.focus;
         assert_eq!(Some(l0), tree.find_split_in_direction(l2, Direction::Left));
         assert_eq!(Some(l1), tree.find_split_in_direction(l2, Direction::Down));
         assert_eq!(Some(r0), tree.find_split_in_direction(l2, Direction::Right));