b9100fb · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Fix clippy

b9100fbWojciech Kępka5 years ago

helix-term/src/commands.rs+6−12

compare with master

unifiedsplit

@@ -914,10 +914,8 @@ mod cmd {

914

915 fn quit(editor: &mut Editor, args: &[&str], event: PromptEvent) {

916 // last view and we have unsaved changes

917− if editor.tree.views().count() == 1 {

917+ if editor.tree.views().count() == 1 && _buffers_remaining(editor) {

918− if _buffers_remaining(editor) {

919− return;

918+ return;

920− }

921 }

919 }

922 editor.close(editor.view().id, /* close_buffer */ false);

920 editor.close(editor.view().id, /* close_buffer */ false);

923 }

921 }

@@ -1056,10 +1054,8 @@ mod cmd {

1056 editor.set_error(errors);

1054 editor.set_error(errors);

1057

1055

1058 if quit {

1056 if quit {

1059− if !force {

1060− if _buffers_remaining(editor) {

1057+ if !force && _buffers_remaining(editor) {

1061− return;

1058+ return;

1062− }

1063 }

1059 }

1064

1060

1065 // close all views

1061 // close all views

@@ -1083,10 +1079,8 @@ mod cmd {

1083 }

1079 }

1084

1080

1085 fn _quit_all(editor: &mut Editor, args: &[&str], event: PromptEvent, force: bool) {

1081 fn _quit_all(editor: &mut Editor, args: &[&str], event: PromptEvent, force: bool) {

1086− if !force {

1087− if _buffers_remaining(editor) {

1082+ if !force && _buffers_remaining(editor) {

1088− return;

1083+ return;

1089− }

1090 }

1084 }

1091

1085

1092 // close all views

1086 // close all views