From 62003308a74717eef18f103da1b0109f06970687 Mon Sep 17 00:00:00 2001 From: veeso Date: Fri, 13 Jan 2023 12:47:21 +0100 Subject: [PATCH] lint --- src/ui/activities/auth/components/form.rs | 2 +- src/ui/activities/auth/view.rs | 10 +++------- src/ui/activities/filetransfer/view.rs | 2 +- src/ui/activities/setup/components/config.rs | 8 ++++---- src/ui/activities/setup/view/mod.rs | 10 +++++----- src/ui/activities/setup/view/ssh_keys.rs | 6 +++--- src/ui/activities/setup/view/theme.rs | 8 ++++---- src/utils/fmt.rs | 2 +- 8 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/ui/activities/auth/components/form.rs b/src/ui/activities/auth/components/form.rs index 618f15c..34f28e5 100644 --- a/src/ui/activities/auth/components/form.rs +++ b/src/ui/activities/auth/components/form.rs @@ -400,7 +400,7 @@ impl RadioS3NewPathStyle { .foreground(color) .rewind(true) .title("New path style", Alignment::Left) - .value(if new_path_style { 0 } else { 1 }), + .value(usize::from(!new_path_style)), } } } diff --git a/src/ui/activities/auth/view.rs b/src/ui/activities/auth/view.rs index 55d22a4..d885757 100644 --- a/src/ui/activities/auth/view.rs +++ b/src/ui/activities/auth/view.rs @@ -22,15 +22,11 @@ impl AuthActivity { // Headers assert!(self .app - .mount(Id::Title, Box::new(components::Title::default()), vec![]) + .mount(Id::Title, Box::::default(), vec![]) .is_ok()); assert!(self .app - .mount( - Id::Subtitle, - Box::new(components::Subtitle::default()), - vec![] - ) + .mount(Id::Subtitle, Box::::default(), vec![]) .is_ok()); // Footer assert!(self @@ -975,7 +971,7 @@ impl AuthActivity { .app .mount( Id::GlobalListener, - Box::new(components::GlobalListener::default()), + Box::::default(), vec![ Sub::new( SubEventClause::Keyboard(KeyEvent { diff --git a/src/ui/activities/filetransfer/view.rs b/src/ui/activities/filetransfer/view.rs index c69d973..f93c4be 100644 --- a/src/ui/activities/filetransfer/view.rs +++ b/src/ui/activities/filetransfer/view.rs @@ -924,7 +924,7 @@ impl FileTransferActivity { .app .mount( Id::GlobalListener, - Box::new(components::GlobalListener::default()), + Box::::default(), vec![ Sub::new( SubEventClause::Keyboard(KeyEvent { diff --git a/src/ui/activities/setup/components/config.rs b/src/ui/activities/setup/components/config.rs index ed41f05..48b57f1 100644 --- a/src/ui/activities/setup/components/config.rs +++ b/src/ui/activities/setup/components/config.rs @@ -33,7 +33,7 @@ impl CheckUpdates { .foreground(Color::LightYellow) .rewind(true) .title("Check for updates?", Alignment::Left) - .value(if enabled { 0 } else { 1 }), + .value(usize::from(!enabled)), } } } @@ -145,7 +145,7 @@ impl HiddenFiles { .foreground(Color::LightRed) .rewind(true) .title("Show hidden files? (by default)", Alignment::Left) - .value(if enabled { 0 } else { 1 }), + .value(usize::from(!enabled)), } } } @@ -179,7 +179,7 @@ impl NotificationsEnabled { .foreground(Color::LightRed) .rewind(true) .title("Enable notifications?", Alignment::Left) - .value(if enabled { 0 } else { 1 }), + .value(usize::from(!enabled)), } } } @@ -213,7 +213,7 @@ impl PromptOnFileReplace { .foreground(Color::LightBlue) .rewind(true) .title("Prompt when replacing existing files?", Alignment::Left) - .value(if enabled { 0 } else { 1 }), + .value(usize::from(!enabled)), } } } diff --git a/src/ui/activities/setup/view/mod.rs b/src/ui/activities/setup/view/mod.rs index 0cb11d8..4204dc4 100644 --- a/src/ui/activities/setup/view/mod.rs +++ b/src/ui/activities/setup/view/mod.rs @@ -67,7 +67,7 @@ impl SetupActivity { .app .remount( Id::Common(IdCommon::QuitPopup), - Box::new(components::QuitPopup::default()), + Box::::default(), vec![], ) .is_ok()); @@ -85,7 +85,7 @@ impl SetupActivity { .app .remount( Id::Common(IdCommon::SavePopup), - Box::new(components::SavePopup::default()), + Box::::default(), vec![], ) .is_ok()); @@ -103,7 +103,7 @@ impl SetupActivity { .app .remount( Id::Common(IdCommon::Keybindings), - Box::new(components::Keybindings::default()), + Box::::default(), vec![], ) .is_ok()); @@ -162,7 +162,7 @@ impl SetupActivity { .app .remount( Id::Common(IdCommon::Footer), - Box::new(components::Footer::default()), + Box::::default(), vec![], ) .is_ok()); @@ -174,7 +174,7 @@ impl SetupActivity { .app .mount( Id::Common(IdCommon::GlobalListener), - Box::new(components::GlobalListener::default()), + Box::::default(), vec![ Sub::new( SubEventClause::Keyboard(KeyEvent { diff --git a/src/ui/activities/setup/view/ssh_keys.rs b/src/ui/activities/setup/view/ssh_keys.rs index 647c848..b860b1d 100644 --- a/src/ui/activities/setup/view/ssh_keys.rs +++ b/src/ui/activities/setup/view/ssh_keys.rs @@ -78,7 +78,7 @@ impl SetupActivity { .app .remount( Id::Ssh(IdSsh::DelSshKeyPopup), - Box::new(components::DelSshKeyPopup::default()), + Box::::default(), vec![] ) .is_ok()); @@ -96,7 +96,7 @@ impl SetupActivity { .app .remount( Id::Ssh(IdSsh::SshHost), - Box::new(components::SshHost::default()), + Box::::default(), vec![] ) .is_ok()); @@ -104,7 +104,7 @@ impl SetupActivity { .app .remount( Id::Ssh(IdSsh::SshUsername), - Box::new(components::SshUsername::default()), + Box::::default(), vec![] ) .is_ok()); diff --git a/src/ui/activities/setup/view/theme.rs b/src/ui/activities/setup/view/theme.rs index 5c00f9f..91d3530 100644 --- a/src/ui/activities/setup/view/theme.rs +++ b/src/ui/activities/setup/view/theme.rs @@ -246,7 +246,7 @@ impl SetupActivity { .app .remount( Id::Theme(IdTheme::AuthTitle), - Box::new(components::AuthTitle::default()), + Box::::default(), vec![] ) .is_ok()); @@ -254,7 +254,7 @@ impl SetupActivity { .app .remount( Id::Theme(IdTheme::MiscTitle), - Box::new(components::MiscTitle::default()), + Box::::default(), vec![] ) .is_ok()); @@ -262,7 +262,7 @@ impl SetupActivity { .app .remount( Id::Theme(IdTheme::TransferTitle), - Box::new(components::TransferTitle::default()), + Box::::default(), vec![] ) .is_ok()); @@ -270,7 +270,7 @@ impl SetupActivity { .app .remount( Id::Theme(IdTheme::TransferTitle2), - Box::new(components::TransferTitle2::default()), + Box::::default(), vec![] ) .is_ok()); diff --git a/src/utils/fmt.rs b/src/utils/fmt.rs index 044bc64..9122821 100644 --- a/src/utils/fmt.rs +++ b/src/utils/fmt.rs @@ -63,7 +63,7 @@ pub fn fmt_path_elide(p: &Path, width: usize) -> String { /// This function allows to specify an extra length to consider to elide path pub fn fmt_path_elide_ex(p: &Path, width: usize, extra_len: usize) -> String { let fmt_path: String = format!("{}", p.display()); - match fmt_path.width() + extra_len > width as usize { + match fmt_path.width() + extra_len > width { false => fmt_path, true => { // Elide