aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Sharshakov2021-08-21 11:35:53 +0000
committerDmitry Sharshakov2021-08-21 11:35:53 +0000
commit5f5b383979b34817cbadbc7b686aec4e8e298e46 (patch)
treeafe0913be423010cebf77545e4cd474119972f61
parent6458edecfd5fda486c9b9a1d0d802aa23bcd90ac (diff)
Fix clippy warnings
-rw-r--r--helix-term/src/commands.rs4
-rw-r--r--helix-term/src/ui/editor.rs8
2 files changed, 6 insertions, 6 deletions
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index b463da2a..9a8e1ee6 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -4288,10 +4288,10 @@ async fn dap_listen_stopped(
.threads()
.await
.ok()
- .and_then(|threads| threads.get(0).and_then(|x| Some(x.clone())));
+ .and_then(|threads| threads.get(0).cloned());
if let Some(main) = main {
let (a, _) = dbg.stack_trace(main.id).await.unwrap();
- dbg.stack_pointer = a.get(0).and_then(|x| Some(x.clone()));
+ dbg.stack_pointer = a.get(0).cloned();
}
}
}
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index d48fc061..976323dd 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -450,7 +450,7 @@ impl EditorView {
if let Some(debugger) = debugger {
if let Some(path) = doc.path() {
let dbg = block_on(debugger.lock());
- breakpoints = dbg.breakpoints.get(path).and_then(|bps| Some(bps.clone()));
+ breakpoints = dbg.breakpoints.get(path).cloned();
stack_pointer = dbg.stack_pointer.clone()
}
}
@@ -475,7 +475,7 @@ impl EditorView {
let selected = cursors.contains(&line);
if let Some(bps) = breakpoints.as_ref() {
- if let Some(_) = bps.iter().find(|breakpoint| breakpoint.line == line) {
+ if bps.iter().any(|breakpoint| breakpoint.line == line) {
surface.set_stringn(viewport.x, viewport.y + i as u16, "▲", 1, warning);
}
}
@@ -484,7 +484,7 @@ impl EditorView {
if let Some(src) = sp.source.as_ref() {
if doc
.path()
- .and_then(|path| Some(src.path == Some(path.clone())))
+ .map(|path| src.path == Some(path.clone()))
.unwrap_or(false)
&& sp.line == line
{
@@ -1045,7 +1045,7 @@ impl Component for EditorView {
let loader = &cx.editor.syn_loader;
let mut dbg: Option<Arc<Mutex<helix_dap::Client>>> = None;
if let Some(debugger) = &cx.editor.debugger {
- dbg = Some(Arc::clone(&debugger));
+ dbg = Some(Arc::clone(debugger));
}
self.render_view(
doc,