Skip to content

Commit 795ea0d

Browse files
panekjpanekj
committed
fix clippy
1 parent 7100aa4 commit 795ea0d

File tree

12 files changed

+33
-47
lines changed

12 files changed

+33
-47
lines changed

‎lapce-app/src/doc.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ pub struct Doc {
185185
/// (line, col)
186186
pub completion_pos: RwSignal<(usize, usize)>,
187187

188-
/// Current inline completion text, if any.
188+
/// Current inline completion text, if any.
189189
/// This will be displayed even on views that are not focused.
190190
pub inline_completion: RwSignal<Option<String>>,
191191
/// (line, col)
@@ -641,7 +641,7 @@ impl Doc {
641641
self.buffer.with_untracked(|b| b.rev())
642642
}
643643

644-
/// Get the buffer's line-ending.
644+
/// Get the buffer's line-ending.
645645
/// Note: this may not be the same as what the actual line endings in the file are, rather this
646646
/// is what the line-ending is set to (and what it will be saved as).
647647
pub fn line_ending(&self) -> LineEnding {
@@ -705,8 +705,7 @@ impl Doc {
705705
fn check_auto_save(&self) {
706706
let config = self.common.config.get_untracked();
707707
if config.editor.autosave_interval > 0 {
708-
let Some(path) =
709-
self.content.with_untracked(|c| c.path().map(|x| x.clone()))
708+
let Some(path) = self.content.with_untracked(|c| c.path().cloned())
710709
else {
711710
return;
712711
};
@@ -1272,12 +1271,13 @@ impl Doc {
12721271
.set(FindProgress::InProgress(Selection::new()));
12731272

12741273
let find_result = self.find_result.clone();
1275-
let find_rev_signal = self.common.find.rev.clone();
1276-
let triggered_by_changes = self.common.find.triggered_by_changes.clone();
1274+
let find_rev_signal = self.common.find.rev;
1275+
let triggered_by_changes = self.common.find.triggered_by_changes;
12771276

1278-
let path = self.content.get_untracked().path().map(|x| x.clone());
1277+
let path = self.content.get_untracked().path().cloned();
12791278
let common = self.common.clone();
12801279
let send = create_ext_action(self.scope, move |occurrences: Selection| {
1280+
#[allow(clippy::single_match)]
12811281
match (
12821282
occurrences.regions().is_empty(),
12831283
&path,
@@ -2099,11 +2099,7 @@ impl Styling for DocStyling {
20992099
&& end >= start_offset
21002100
&& diag.severity < Some(DiagnosticSeverity::HINT)
21012101
{
2102-
let start = if start > start_offset {
2103-
start - start_offset
2104-
} else {
2105-
0
2106-
};
2102+
let start = start.saturating_sub(start_offset);
21072103
let end = end - start_offset;
21082104
let start = phantom_text.col_after(start, true);
21092105
let end = phantom_text.col_after(end, false);

‎lapce-app/src/editor/gutter.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,18 +242,18 @@ impl FoldingRanges {
242242
FoldingRangeStatus::Fold => {
243243
folded.insert(
244244
item.start.line,
245-
FoldingDisplayItem::Folded(item.start.clone()),
245+
FoldingDisplayItem::Folded(item.start),
246246
);
247247
limit_line = item.end.line;
248248
}
249249
FoldingRangeStatus::Unfold => {
250250
unfold_start.insert(
251251
item.start.line,
252-
FoldingDisplayItem::UnfoldStart(item.start.clone()),
252+
FoldingDisplayItem::UnfoldStart(item.start),
253253
);
254254
unfold_end.insert(
255255
item.end.line,
256-
FoldingDisplayItem::UnfoldEnd(item.end.clone()),
256+
FoldingDisplayItem::UnfoldEnd(item.end),
257257
);
258258
limit_line = 0;
259259
}
@@ -265,9 +265,8 @@ impl FoldingRanges {
265265
for (key, val) in folded {
266266
unfold_start.insert(key, val);
267267
}
268-
let items = unfold_start.into_iter().map(|x| x.1).collect();
269268

270-
items
269+
unfold_start.into_iter().map(|x| x.1).collect()
271270
}
272271
}
273272

‎lapce-app/src/editor/view.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1726,7 +1726,7 @@ fn editor_gutter_folding_range(
17261726
viewport: RwSignal<Rect>,
17271727
) -> impl View {
17281728
let config = window_tab_data.common.config;
1729-
let doc_clone = doc.clone();
1729+
let doc_clone = doc;
17301730
dyn_stack(
17311731
move || doc.get().folding_ranges.get().to_display_items(),
17321732
move |item| *item,
@@ -1738,7 +1738,7 @@ fn editor_gutter_folding_range(
17381738
item,
17391739
)
17401740
.on_click_stop({
1741-
let value = doc_clone.clone();
1741+
let value = doc_clone;
17421742
move |_| {
17431743
value.get_untracked().folding_ranges.update(|x| match item {
17441744
FoldingDisplayItem::UnfoldStart(pos)

‎lapce-app/src/main_split.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ impl Editors {
237237
Self(cx.create_rw_signal(im::HashMap::new()))
238238
}
239239

240-
/// Add an editor to the editors.
240+
/// Add an editor to the editors.
241241
/// Returns the id of the editor.
242242
pub fn insert(&self, editor: EditorData) -> EditorId {
243243
let id = editor.id();
@@ -2377,10 +2377,7 @@ impl MainSplitData {
23772377
if let Some(tab_id) = self.editor_tabs.with_untracked(|x| {
23782378
for (tab_id, tab_data) in x {
23792379
if tab_data.with_untracked(|x| {
2380-
x.children
2381-
.iter()
2382-
.find(|(_, _, child)| child.id() == id)
2383-
.is_some()
2380+
x.children.iter().any(|(_, _, child)| child.id() == id)
23842381
}) {
23852382
return Some(*tab_id);
23862383
}

‎lapce-app/src/settings.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,8 @@ pub fn settings_view(
337337
let search_editor = editors.make_local(cx, common);
338338
let doc = search_editor.doc_signal();
339339

340-
let items = settings_data.items.clone();
341-
let kinds = settings_data.kinds.clone();
340+
let items = settings_data.items;
341+
let kinds = settings_data.kinds;
342342
let filtered_items_signal = settings_data.filtered_items;
343343
create_effect(move |_| {
344344
let doc = doc.get();
@@ -370,7 +370,6 @@ pub fn settings_view(
370370
let scroll_pos = create_rw_signal(Point::ZERO);
371371

372372
let current_kind = {
373-
let kinds = kinds.clone();
374373
create_memo(move |_| {
375374
let scroll_pos = scroll_pos.get();
376375
let scroll_y = scroll_pos.y + 30.0;

‎lapce-app/src/update.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ pub fn restart(path: &Path) -> Result<()> {
166166
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))]
167167
pub fn restart(path: &Path) -> Result<()> {
168168
use std::os::unix::process::CommandExt;
169-
std::process::Command::new(path).arg("-n").exec();
169+
let _ = std::process::Command::new(path).arg("-n").exec();
170170
Ok(())
171171
}
172172

‎lapce-app/src/window_tab.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,6 @@ impl WindowTabData {
671671
.installed
672672
.get_untracked()
673673
.values()
674-
.into_iter()
675674
.map(|x| {
676675
let meta = x.meta.get_untracked();
677676
(meta.name.clone(), meta)

‎lapce-core/src/lens.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ impl LensBuilder {
292292
}
293293
}
294294

295-
impl<'a> Iterator for LensIter<'a> {
295+
impl Iterator for LensIter<'_> {
296296
type Item = (usize, usize);
297297

298298
fn next(&mut self) -> Option<Self::Item> {

‎lapce-core/src/style.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,7 @@ pub fn line_styles(
6464
if start > end_offset || end < start_offset {
6565
None
6666
} else {
67-
let start = if start > start_offset {
68-
start - start_offset
69-
} else {
70-
0
71-
};
67+
let start = start.saturating_sub(start_offset);
7268
let end = end - start_offset;
7369
let style = style.clone();
7470
Some(LineStyle { start, end, style })

‎lapce-core/src/syntax/highlight.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,13 +393,13 @@ pub(crate) struct HighlightIterLayer<'a> {
393393
pub(crate) depth: usize,
394394
}
395395

396-
impl<'a> std::fmt::Debug for HighlightIterLayer<'a> {
396+
impl std::fmt::Debug for HighlightIterLayer<'_> {
397397
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
398398
f.debug_struct("HighlightIterLayer").finish()
399399
}
400400
}
401401

402-
impl<'a> HighlightIterLayer<'a> {
402+
impl HighlightIterLayer<'_> {
403403
// First, sort scope boundaries by their byte offset in the document. At a
404404
// given position, emit scope endings before scope beginnings. Finally, emit
405405
// scope boundaries from deeper layers first.
@@ -426,7 +426,7 @@ impl<'a> HighlightIterLayer<'a> {
426426
}
427427
}
428428

429-
impl<'a> HighlightIter<'a> {
429+
impl HighlightIter<'_> {
430430
fn emit_event(
431431
&mut self,
432432
offset: usize,
@@ -481,7 +481,7 @@ impl<'a> HighlightIter<'a> {
481481
}
482482
}
483483

484-
impl<'a> Iterator for HighlightIter<'a> {
484+
impl Iterator for HighlightIter<'_> {
485485
type Item = Result<HighlightEvent, super::Error>;
486486

487487
fn next(&mut self) -> Option<Self::Item> {

0 commit comments

Comments
 (0)