git.iko.soy/helix
on master help sign in
Fix clippy warnings
5f5b383Dmitry Sharshakov
helix-term/src/commands.rs+2−2
compare with master
unifiedsplit
@@ -4288,10 +4288,10 @@ async fn dap_listen_stopped(
4288 .threads()
4288 .threads()
4289 .await
4289 .await
4290 .ok()
4290 .ok()
4291− .and_then(|threads| threads.get(0).and_then(|x| Some(x.clone())));
4291+ .and_then(|threads| threads.get(0).cloned());
4292 if let Some(main) = main {
4292 if let Some(main) = main {
4293 let (a, _) = dbg.stack_trace(main.id).await.unwrap();
4293 let (a, _) = dbg.stack_trace(main.id).await.unwrap();
4294− dbg.stack_pointer = a.get(0).and_then(|x| Some(x.clone()));
4294+ dbg.stack_pointer = a.get(0).cloned();
4295 }
4295 }
4296 }
4296 }
4297}
4297}
helix-term/src/ui/editor.rs+4−4
@@ -450,7 +450,7 @@ impl EditorView {
450 if let Some(debugger) = debugger {
450 if let Some(debugger) = debugger {
451 if let Some(path) = doc.path() {
451 if let Some(path) = doc.path() {
452 let dbg = block_on(debugger.lock());
452 let dbg = block_on(debugger.lock());
453− breakpoints = dbg.breakpoints.get(path).and_then(|bps| Some(bps.clone()));
453+ breakpoints = dbg.breakpoints.get(path).cloned();
454 stack_pointer = dbg.stack_pointer.clone()
454 stack_pointer = dbg.stack_pointer.clone()
455 }
455 }
456 }
456 }
@@ -475,7 +475,7 @@ impl EditorView {
475 let selected = cursors.contains(&line);
475 let selected = cursors.contains(&line);
476
476
477 if let Some(bps) = breakpoints.as_ref() {
477 if let Some(bps) = breakpoints.as_ref() {
478− if let Some(_) = bps.iter().find(|breakpoint| breakpoint.line == line) {
478+ if bps.iter().any(|breakpoint| breakpoint.line == line) {
479 surface.set_stringn(viewport.x, viewport.y + i as u16, "▲", 1, warning);
479 surface.set_stringn(viewport.x, viewport.y + i as u16, "▲", 1, warning);
480 }
480 }
481 }
481 }
@@ -484,7 +484,7 @@ impl EditorView {
484 if let Some(src) = sp.source.as_ref() {
484 if let Some(src) = sp.source.as_ref() {
485 if doc
485 if doc
486 .path()
486 .path()
487− .and_then(|path| Some(src.path == Some(path.clone())))
487+ .map(|path| src.path == Some(path.clone()))
488 .unwrap_or(false)
488 .unwrap_or(false)
489 && sp.line == line
489 && sp.line == line
490 {
490 {
@@ -1045,7 +1045,7 @@ impl Component for EditorView {
1045 let loader = &cx.editor.syn_loader;
1045 let loader = &cx.editor.syn_loader;
1046 let mut dbg: Option<Arc<Mutex<helix_dap::Client>>> = None;
1046 let mut dbg: Option<Arc<Mutex<helix_dap::Client>>> = None;
1047 if let Some(debugger) = &cx.editor.debugger {
1047 if let Some(debugger) = &cx.editor.debugger {
1048− dbg = Some(Arc::clone(&debugger));
1048+ dbg = Some(Arc::clone(debugger));
1049 }
1049 }
1050 self.render_view(
1050 self.render_view(
1051 doc,
1051 doc,