aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authora-kenji <aks.kenji@protonmail.com>2022-06-10 11:42:47 +0200
committerGitHub <noreply@github.com>2022-06-10 11:42:47 +0200
commit9544a09786ef39ed741db166c5052cade45fde91 (patch)
treed702a439cd29e555e5e1225dee12087895087275
parentadd(README): quick links to documentation (#1473) (diff)
downloadsl0ppij-9544a09786ef39ed741db166c5052cade45fde91.tar.gz
sl0ppij-9544a09786ef39ed741db166c5052cade45fde91.tar.xz
sl0ppij-9544a09786ef39ed741db166c5052cade45fde91.zip
add: fix a small lint (#1476)
-rw-r--r--zellij-server/src/panes/grid.rs4
-rw-r--r--zellij-server/src/panes/terminal_pane.rs2
-rw-r--r--zellij-server/src/tab/mod.rs2
3 files changed, 4 insertions, 4 deletions
diff --git a/zellij-server/src/panes/grid.rs b/zellij-server/src/panes/grid.rs
index 55b9edab..ce7c7157 100644
--- a/zellij-server/src/panes/grid.rs
+++ b/zellij-server/src/panes/grid.rs
@@ -839,10 +839,10 @@ impl Grid {
let mut scrollback: String = dump_screen!(self.lines_above);
let viewport: String = dump_screen!(self.viewport);
if !scrollback.is_empty() {
- scrollback.push_str("\n");
+ scrollback.push('\n');
}
scrollback.push_str(&viewport);
- return scrollback;
+ scrollback
}
pub fn move_viewport_up(&mut self, count: usize) {
for _ in 0..count {
diff --git a/zellij-server/src/panes/terminal_pane.rs b/zellij-server/src/panes/terminal_pane.rs
index dd91149b..4e57f462 100644
--- a/zellij-server/src/panes/terminal_pane.rs
+++ b/zellij-server/src/panes/terminal_pane.rs
@@ -387,7 +387,7 @@ impl Pane for TerminalPane {
self.reflow_lines();
}
fn dump_screen(&mut self, _client_id: ClientId) -> String {
- return self.grid.dump_screen();
+ self.grid.dump_screen()
}
fn scroll_up(&mut self, count: usize, _client_id: ClientId) {
self.grid.move_viewport_up(count);
diff --git a/zellij-server/src/tab/mod.rs b/zellij-server/src/tab/mod.rs
index 5c3d0434..c6ebf0b2 100644
--- a/zellij-server/src/tab/mod.rs
+++ b/zellij-server/src/tab/mod.rs
@@ -159,7 +159,7 @@ pub trait Pane {
fn pull_left(&mut self, count: usize);
fn pull_up(&mut self, count: usize);
fn dump_screen(&mut self, _client_id: ClientId) -> String {
- return "".to_owned();
+ "".to_owned()
}
fn scroll_up(&mut self, count: usize, client_id: ClientId);
fn scroll_down(&mut self, count: usize, client_id: ClientId);