5f5b383 · helix · git.iko.soy

git.iko.soy/helix

Fix clippy warnings

commit5f5b383979b34817cbadbc7b686aec4e8e298e46 authorDmitry Sharshakov <d3dx12.xx@gmail.com> dateSat 21 Aug 2021, 14:35 (5 years ago) parent6458ede

2 files changed+6−6

compare with master

unifiedsplit

helix-term/src/commands.rs+2−2 helix-term/src/ui/editor.rs+4−4

helix-term/src/commands.rs+2−2

@@ -4288,10 +4288,10 @@ async fn dap_listen_stopped(

42884288 .threads()

42894289 .await

42904290 .ok()

4291− .and_then(|threads| threads.get(0).and_then(|x| Some(x.clone())));

4291+ .and_then(|threads| threads.get(0).cloned());

42924292 if let Some(main) = main {

42934293 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();

42954295 }

42964296 }

42974297}

helix-term/src/ui/editor.rs+4−4

@@ -450,7 +450,7 @@ impl EditorView {

450450 if let Some(debugger) = debugger {

451451 if let Some(path) = doc.path() {

452452 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();

454454 stack_pointer = dbg.stack_pointer.clone()

455455 }

456456 }

@@ -475,7 +475,7 @@ impl EditorView {

475475 let selected = cursors.contains(&line);

476476

477477 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) {

479479 surface.set_stringn(viewport.x, viewport.y + i as u16, "▲", 1, warning);

480480 }

481481 }

@@ -484,7 +484,7 @@ impl EditorView {

484484 if let Some(src) = sp.source.as_ref() {

485485 if doc

486486 .path()

487− .and_then(|path| Some(src.path == Some(path.clone())))

487+ .map(|path| src.path == Some(path.clone()))

488488 .unwrap_or(false)

489489 && sp.line == line

490490 {

@@ -1045,7 +1045,7 @@ impl Component for EditorView {

10451045 let loader = &cx.editor.syn_loader;

10461046 let mut dbg: Option<Arc<Mutex<helix_dap::Client>>> = None;

10471047 if let Some(debugger) = &cx.editor.debugger {

1048− dbg = Some(Arc::clone(&debugger));

1048+ dbg = Some(Arc::clone(debugger));

10491049 }

10501050 self.render_view(

10511051 doc,