fix clippy

Author: panekj

lapce-app/src/doc.rs

@@ -185,7 +185,7 @@ pub struct Doc {
     /// (line, col)
     pub completion_pos: RwSignal<(usize, usize)>,
 
-    /// Current inline completion text, if any.  
+    /// Current inline completion text, if any.
     /// This will be displayed even on views that are not focused.
     pub inline_completion: RwSignal<Option<String>>,
     /// (line, col)
@@ -641,7 +641,7 @@ impl Doc {
         self.buffer.with_untracked(|b| b.rev())
     }
 
-    /// Get the buffer's line-ending.  
+    /// Get the buffer's line-ending.
     /// Note: this may not be the same as what the actual line endings in the file are, rather this
     /// is what the line-ending is set to (and what it will be saved as).
     pub fn line_ending(&self) -> LineEnding {
@@ -705,8 +705,7 @@ impl Doc {
     fn check_auto_save(&self) {
         let config = self.common.config.get_untracked();
         if config.editor.autosave_interval > 0 {
-            let Some(path) =
-                self.content.with_untracked(|c| c.path().map(|x| x.clone()))
+            let Some(path) = self.content.with_untracked(|c| c.path().cloned())
             else {
                 return;
             };
@@ -1272,12 +1271,13 @@ impl Doc {
             .set(FindProgress::InProgress(Selection::new()));
 
         let find_result = self.find_result.clone();
-        let find_rev_signal = self.common.find.rev.clone();
-        let triggered_by_changes = self.common.find.triggered_by_changes.clone();
+        let find_rev_signal = self.common.find.rev;
+        let triggered_by_changes = self.common.find.triggered_by_changes;
 
-        let path = self.content.get_untracked().path().map(|x| x.clone());
+        let path = self.content.get_untracked().path().cloned();
         let common = self.common.clone();
         let send = create_ext_action(self.scope, move |occurrences: Selection| {
+            #[allow(clippy::single_match)]
             match (
                 occurrences.regions().is_empty(),
                 &path,
@@ -2099,11 +2099,7 @@ impl Styling for DocStyling {
                         && end >= start_offset
                         && diag.severity < Some(DiagnosticSeverity::HINT)
                     {
-                        let start = if start > start_offset {
-                            start - start_offset
-                        } else {
-                            0
-                        };
+                        let start = start.saturating_sub(start_offset);
                         let end = end - start_offset;
                         let start = phantom_text.col_after(start, true);
                         let end = phantom_text.col_after(end, false);

lapce-app/src/editor/gutter.rs

@@ -242,18 +242,18 @@ impl FoldingRanges {
                 FoldingRangeStatus::Fold => {
                     folded.insert(
                         item.start.line,
-                        FoldingDisplayItem::Folded(item.start.clone()),
+                        FoldingDisplayItem::Folded(item.start),
                     );
                     limit_line = item.end.line;
                 }
                 FoldingRangeStatus::Unfold => {
                     unfold_start.insert(
                         item.start.line,
-                        FoldingDisplayItem::UnfoldStart(item.start.clone()),
+                        FoldingDisplayItem::UnfoldStart(item.start),
                     );
                     unfold_end.insert(
                         item.end.line,
-                        FoldingDisplayItem::UnfoldEnd(item.end.clone()),
+                        FoldingDisplayItem::UnfoldEnd(item.end),
                     );
                     limit_line = 0;
                 }
@@ -265,9 +265,8 @@ impl FoldingRanges {
         for (key, val) in folded {
             unfold_start.insert(key, val);
         }
-        let items = unfold_start.into_iter().map(|x| x.1).collect();
 
-        items
+        unfold_start.into_iter().map(|x| x.1).collect()
     }
 }
 

lapce-app/src/editor/view.rs

@@ -1726,7 +1726,7 @@ fn editor_gutter_folding_range(
     viewport: RwSignal<Rect>,
 ) -> impl View {
     let config = window_tab_data.common.config;
-    let doc_clone = doc.clone();
+    let doc_clone = doc;
     dyn_stack(
         move || doc.get().folding_ranges.get().to_display_items(),
         move |item| *item,
@@ -1738,7 +1738,7 @@ fn editor_gutter_folding_range(
                 item,
             )
             .on_click_stop({
-                let value = doc_clone.clone();
+                let value = doc_clone;
                 move |_| {
                     value.get_untracked().folding_ranges.update(|x| match item {
                         FoldingDisplayItem::UnfoldStart(pos)

lapce-app/src/main_split.rs

@@ -237,7 +237,7 @@ impl Editors {
         Self(cx.create_rw_signal(im::HashMap::new()))
     }
 
-    /// Add an editor to the editors.  
+    /// Add an editor to the editors.
     /// Returns the id of the editor.
     pub fn insert(&self, editor: EditorData) -> EditorId {
         let id = editor.id();
@@ -2377,10 +2377,7 @@ impl MainSplitData {
                 if let Some(tab_id) = self.editor_tabs.with_untracked(|x| {
                     for (tab_id, tab_data) in x {
                         if tab_data.with_untracked(|x| {
-                            x.children
-                                .iter()
-                                .find(|(_, _, child)| child.id() == id)
-                                .is_some()
+                            x.children.iter().any(|(_, _, child)| child.id() == id)
                         }) {
                             return Some(*tab_id);
                         }

lapce-app/src/settings.rs

@@ -337,8 +337,8 @@ pub fn settings_view(
     let search_editor = editors.make_local(cx, common);
     let doc = search_editor.doc_signal();
 
-    let items = settings_data.items.clone();
-    let kinds = settings_data.kinds.clone();
+    let items = settings_data.items;
+    let kinds = settings_data.kinds;
     let filtered_items_signal = settings_data.filtered_items;
     create_effect(move |_| {
         let doc = doc.get();
@@ -370,7 +370,6 @@ pub fn settings_view(
     let scroll_pos = create_rw_signal(Point::ZERO);
 
     let current_kind = {
-        let kinds = kinds.clone();
         create_memo(move |_| {
             let scroll_pos = scroll_pos.get();
             let scroll_y = scroll_pos.y + 30.0;

lapce-app/src/update.rs

@@ -166,7 +166,7 @@ pub fn restart(path: &Path) -> Result<()> {
 #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
 pub fn restart(path: &Path) -> Result<()> {
     use std::os::unix::process::CommandExt;
-    std::process::Command::new(path).arg("-n").exec();
+    let _ = std::process::Command::new(path).arg("-n").exec();
     Ok(())
 }
 

lapce-app/src/window_tab.rs

@@ -671,7 +671,6 @@ impl WindowTabData {
                     .installed
                     .get_untracked()
                     .values()
-                    .into_iter()
                     .map(|x| {
                         let meta = x.meta.get_untracked();
                         (meta.name.clone(), meta)

lapce-core/src/lens.rs

@@ -292,7 +292,7 @@ impl LensBuilder {
     }
 }
 
-impl<'a> Iterator for LensIter<'a> {
+impl Iterator for LensIter<'_> {
     type Item = (usize, usize);
 
     fn next(&mut self) -> Option<Self::Item> {

lapce-core/src/style.rs

@@ -64,11 +64,7 @@ pub fn line_styles(
             if start > end_offset || end < start_offset {
                 None
             } else {
-                let start = if start > start_offset {
-                    start - start_offset
-                } else {
-                    0
-                };
+                let start = start.saturating_sub(start_offset);
                 let end = end - start_offset;
                 let style = style.clone();
                 Some(LineStyle { start, end, style })

lapce-core/src/syntax/highlight.rs

@@ -393,13 +393,13 @@ pub(crate) struct HighlightIterLayer<'a> {
     pub(crate) depth: usize,
 }
 
-impl<'a> std::fmt::Debug for HighlightIterLayer<'a> {
+impl std::fmt::Debug for HighlightIterLayer<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("HighlightIterLayer").finish()
     }
 }
 
-impl<'a> HighlightIterLayer<'a> {
+impl HighlightIterLayer<'_> {
     // First, sort scope boundaries by their byte offset in the document. At a
     // given position, emit scope endings before scope beginnings. Finally, emit
     // scope boundaries from deeper layers first.
@@ -426,7 +426,7 @@ impl<'a> HighlightIterLayer<'a> {
     }
 }
 
-impl<'a> HighlightIter<'a> {
+impl HighlightIter<'_> {
     fn emit_event(
         &mut self,
         offset: usize,
@@ -481,7 +481,7 @@ impl<'a> HighlightIter<'a> {
     }
 }
 
-impl<'a> Iterator for HighlightIter<'a> {
+impl Iterator for HighlightIter<'_> {
     type Item = Result<HighlightEvent, super::Error>;
 
     fn next(&mut self) -> Option<Self::Item> {