pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style(clippy): various fixes (#704)

Browse source 
* test: fix clippy unused_io_amount

* chore(clippy): various clippy fixes

needless_borrow, let_and_return, vec_init_then_push, unit_arg,
useless_format, field_reassign_with_default, redundant_clone
This commit is contained in:
Paulo Coelho 2021-09-09 09:24:03 +01:00 • committed by GitHub
parent 0f0122fb59
commit 6d0c5a56f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 79 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
src/tests/e2e/cases.rs
View file

@ -157,7 +157,7 @@ pub fn cannot_split_terminals_vertically_when_active_terminal_is_too_small() {
instruction: |mut remote_terminal: RemoteTerminal| -> bool { instruction: |mut remote_terminal: RemoteTerminal| -> bool {
// this is just normal input that should be sent into the one terminal so that we can make // this is just normal input that should be sent into the one terminal so that we can make
// sure we silently failed to split in the previous step // sure we silently failed to split in the previous step
remote_terminal.send_key(&"Hi!".as_bytes()); remote_terminal.send_key("Hi!".as_bytes());
true true
}, },
}) })
@ -205,26 +205,26 @@ pub fn scrolling_inside_a_pane() {
let mut step_is_complete = false; let mut step_is_complete = false;
if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() {
// cursor is in the newly opened second pane // cursor is in the newly opened second pane
remote_terminal.send_key(&format!("{:0<56}", "line1 ").as_bytes()); remote_terminal.send_key(format!("{:0<56}", "line1 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line2 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line2 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line3 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line3 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line4 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line4 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line5 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line5 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line6 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line6 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line7 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line7 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line8 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line8 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line9 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line9 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line10 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line10 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line11 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line11 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line12 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line12 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line13 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line13 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line14 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line14 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line15 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line15 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line16 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line16 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line17 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line17 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line18 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line18 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line19 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line19 ").as_bytes());
remote_terminal.send_key(&format!("{:0<57}", "line20 ").as_bytes()); remote_terminal.send_key(format!("{:0<57}", "line20 ").as_bytes());
step_is_complete = true; step_is_complete = true;
} }
step_is_complete step_is_complete
@ -574,7 +574,7 @@ pub fn lock_mode() {
if remote_terminal.snapshot_contains("INTERFACE LOCKED") { if remote_terminal.snapshot_contains("INTERFACE LOCKED") {
remote_terminal.send_key(&TAB_MODE); remote_terminal.send_key(&TAB_MODE);
remote_terminal.send_key(&NEW_TAB_IN_TAB_MODE); remote_terminal.send_key(&NEW_TAB_IN_TAB_MODE);
remote_terminal.send_key(&"abc".as_bytes()); remote_terminal.send_key("abc".as_bytes());
step_is_complete = true; step_is_complete = true;
} }
step_is_complete step_is_complete
@ -675,7 +675,7 @@ pub fn detach_and_attach_session() {
let mut step_is_complete = false; let mut step_is_complete = false;
if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() {
// new pane has been opened and focused // new pane has been opened and focused
remote_terminal.send_key(&"I am some text".as_bytes()); remote_terminal.send_key("I am some text".as_bytes());
step_is_complete = true; step_is_complete = true;
} }
step_is_complete step_is_complete
@ -825,26 +825,26 @@ pub fn scrolling_inside_a_pane_with_mouse() {
let mut step_is_complete = false; let mut step_is_complete = false;
if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() { if remote_terminal.cursor_position_is(63, 2) && remote_terminal.tip_appears() {
// cursor is in the newly opened second pane // cursor is in the newly opened second pane
remote_terminal.send_key(&format!("{:0<56}", "line1 ").as_bytes()); remote_terminal.send_key(format!("{:0<56}", "line1 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line2 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line2 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line3 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line3 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line4 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line4 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line5 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line5 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line6 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line6 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line7 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line7 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line8 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line8 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line9 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line9 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line10 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line10 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line11 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line11 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line12 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line12 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line13 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line13 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line14 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line14 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line15 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line15 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line16 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line16 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line17 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line17 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line18 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line18 ").as_bytes());
remote_terminal.send_key(&format!("{:0<58}", "line19 ").as_bytes()); remote_terminal.send_key(format!("{:0<58}", "line19 ").as_bytes());
remote_terminal.send_key(&format!("{:0<57}", "line20 ").as_bytes()); remote_terminal.send_key(format!("{:0<57}", "line20 ").as_bytes());
step_is_complete = true; step_is_complete = true;
} }
step_is_complete step_is_complete

6
src/tests/e2e/remote_runner.rs
View file

@ -34,9 +34,7 @@ fn setup_remote_environment(channel: &mut ssh2::Channel, win_size: Size) {
.request_pty("xterm", None, Some((columns, rows, 0, 0))) .request_pty("xterm", None, Some((columns, rows, 0, 0)))
.unwrap(); .unwrap();
channel.shell().unwrap(); channel.shell().unwrap();
channel channel.write_all("export PS1=\"$ \"\n".as_bytes()).unwrap();
.write_all(format!("export PS1=\"$ \"\n").as_bytes())
.unwrap();
channel.flush().unwrap(); channel.flush().unwrap();
} }
@ -154,7 +152,7 @@ impl<'a> RemoteTerminal<'a> {
format!("x: {}, y: {}", self.cursor_x, self.cursor_y) format!("x: {}, y: {}", self.cursor_x, self.cursor_y)
} }
pub fn send_key(&mut self, key: &[u8]) { pub fn send_key(&mut self, key: &[u8]) {
self.channel.write(key).unwrap(); self.channel.write_all(key).unwrap();
self.channel.flush().unwrap(); self.channel.flush().unwrap();
} }
pub fn change_size(&mut self, cols: u32, rows: u32) { pub fn change_size(&mut self, cols: u32, rows: u32) {

18
zellij-client/src/unit/input_handler_tests.rs
View file

@ -110,8 +110,7 @@ impl ClientOsApi for FakeClientOsApi {
if stdin_events.is_empty() { if stdin_events.is_empty() {
panic!("ran out of stdin events!"); panic!("ran out of stdin events!");
} }
let next_event = stdin_events.remove(0); stdin_events.remove(0)
next_event
} }
fn box_clone(&self) -> Box<dyn ClientOsApi> { fn box_clone(&self) -> Box<dyn ClientOsApi> {
unimplemented!() unimplemented!()
@ -174,14 +173,14 @@ pub fn quit_breaks_input_loop() {
let send_client_instructions = SenderWithContext::new(send_client_instructions); let send_client_instructions = SenderWithContext::new(send_client_instructions);
let default_mode = InputMode::Normal; let default_mode = InputMode::Normal;
drop(input_loop( input_loop(
client_os_api, client_os_api,
config, config,
options, options,
command_is_executing, command_is_executing,
send_client_instructions, send_client_instructions,
default_mode, default_mode,
)); );
let expected_actions_sent_to_server = vec![Action::Quit]; let expected_actions_sent_to_server = vec![Action::Quit];
let received_actions = extract_actions_sent_to_server(events_sent_to_server); let received_actions = extract_actions_sent_to_server(events_sent_to_server);
assert_eq!( assert_eq!(
@ -192,8 +191,7 @@ pub fn quit_breaks_input_loop() {
#[test] #[test]
pub fn move_focus_left_in_pane_mode() { pub fn move_focus_left_in_pane_mode() {
let mut stdin_events = vec![]; let stdin_events = vec![commands::MOVE_FOCUS_LEFT_IN_NORMAL_MODE.to_vec()];
stdin_events.push(commands::MOVE_FOCUS_LEFT_IN_NORMAL_MODE.to_vec());
let events_sent_to_server = Arc::new(Mutex::new(vec![])); let events_sent_to_server = Arc::new(Mutex::new(vec![]));
let command_is_executing = CommandIsExecuting::new(); let command_is_executing = CommandIsExecuting::new();
let client_os_api = Box::new(FakeClientOsApi::new( let client_os_api = Box::new(FakeClientOsApi::new(
@ -210,14 +208,14 @@ pub fn move_focus_left_in_pane_mode() {
let send_client_instructions = SenderWithContext::new(send_client_instructions); let send_client_instructions = SenderWithContext::new(send_client_instructions);
let default_mode = InputMode::Normal; let default_mode = InputMode::Normal;
drop(input_loop( input_loop(
client_os_api, client_os_api,
config, config,
options, options,
command_is_executing, command_is_executing,
send_client_instructions, send_client_instructions,
default_mode, default_mode,
)); );
let expected_actions_sent_to_server = let expected_actions_sent_to_server =
vec![Action::MoveFocusOrTab(Direction::Left), Action::Quit]; vec![Action::MoveFocusOrTab(Direction::Left), Action::Quit];
let received_actions = extract_actions_sent_to_server(events_sent_to_server); let received_actions = extract_actions_sent_to_server(events_sent_to_server);
@ -250,14 +248,14 @@ pub fn bracketed_paste() {
let send_client_instructions = SenderWithContext::new(send_client_instructions); let send_client_instructions = SenderWithContext::new(send_client_instructions);
let default_mode = InputMode::Normal; let default_mode = InputMode::Normal;
drop(input_loop( input_loop(
client_os_api, client_os_api,
config, config,
options, options,
command_is_executing, command_is_executing,
send_client_instructions, send_client_instructions,
default_mode, default_mode,
)); );
let expected_actions_sent_to_server = vec![ let expected_actions_sent_to_server = vec![
Action::Write(commands::BRACKETED_PASTE_START.to_vec()), Action::Write(commands::BRACKETED_PASTE_START.to_vec()),
Action::Write(commands::MOVE_FOCUS_LEFT_IN_NORMAL_MODE.to_vec()), // keys were directly written to server and not interpreted Action::Write(commands::MOVE_FOCUS_LEFT_IN_NORMAL_MODE.to_vec()), // keys were directly written to server and not interpreted

12
zellij-server/src/logging_pipe.rs
View file

@ -149,7 +149,7 @@ mod logging_pipe_test {
let test_buffer = "Testing write".as_bytes(); let test_buffer = "Testing write".as_bytes();
pipe.write(test_buffer).expect("Err write"); pipe.write_all(test_buffer).expect("Err write");
pipe.flush().expect("Err flush"); pipe.flush().expect("Err flush");
assert_eq!(pipe.buffer.len(), test_buffer.len()); assert_eq!(pipe.buffer.len(), test_buffer.len());
@ -161,7 +161,7 @@ mod logging_pipe_test {
let test_buffer = "Testing write \n".as_bytes(); let test_buffer = "Testing write \n".as_bytes();
pipe.write(test_buffer).expect("Err write"); pipe.write_all(test_buffer).expect("Err write");
pipe.flush().expect("Err flush"); pipe.flush().expect("Err flush");
assert_eq!(pipe.buffer.len(), 0); assert_eq!(pipe.buffer.len(), 0);
@ -174,7 +174,7 @@ mod logging_pipe_test {
let test_buffer = "Testing write \n".as_bytes(); let test_buffer = "Testing write \n".as_bytes();
let test_buffer2 = "And the rest".as_bytes(); let test_buffer2 = "And the rest".as_bytes();
pipe.write( pipe.write_all(
[ [
test_buffer, test_buffer,
test_buffer, test_buffer,
@ -197,7 +197,7 @@ mod logging_pipe_test {
let test_buffer = "Testing write \n".as_bytes(); let test_buffer = "Testing write \n".as_bytes();
pipe.write( pipe.write_all(
[ [
test_buffer, test_buffer,
test_buffer, test_buffer,
@ -223,7 +223,7 @@ mod logging_pipe_test {
// make sure it's not valid utf-8 string if we drop last symbol // make sure it's not valid utf-8 string if we drop last symbol
assert!(std::str::from_utf8(&test_buffer[..test_buffer.len() - 1]).is_err()); assert!(std::str::from_utf8(&test_buffer[..test_buffer.len() - 1]).is_err());
pipe.write(&test_buffer[..test_buffer.len() - 1]) pipe.write_all(&test_buffer[..test_buffer.len() - 1])
.expect("Err write"); .expect("Err write");
pipe.flush().expect("Err flush"); pipe.flush().expect("Err flush");
@ -237,7 +237,7 @@ mod logging_pipe_test {
let mut pipe = LoggingPipe::new("TestPipe", 0); let mut pipe = LoggingPipe::new("TestPipe", 0);
let test_buffer = "Testing write \n".as_bytes(); let test_buffer = "Testing write \n".as_bytes();
pipe.write( pipe.write_all(
[test_buffer, test_buffer, b"\n", b"\n", b"\n"] [test_buffer, test_buffer, b"\n", b"\n", b"\n"]
.concat() .concat()
.as_slice(), .as_slice(),

5
zellij-server/src/panes/unit/grid_tests.rs
View file

@ -8,9 +8,8 @@ fn read_fixture(fixture_name: &str) -> Vec<u8> {
path_to_file.push("tests"); path_to_file.push("tests");
path_to_file.push("fixtures"); path_to_file.push("fixtures");
path_to_file.push(fixture_name); path_to_file.push(fixture_name);
let content = std::fs::read(path_to_file) std::fs::read(path_to_file)
.unwrap_or_else(|_| panic!("could not read fixture {:?}", &fixture_name)); .unwrap_or_else(|_| panic!("could not read fixture {:?}", &fixture_name))
content
} }
#[test] #[test]

6
zellij-server/src/unit/screen_tests.rs
View file

@ -79,8 +79,10 @@ fn create_new_screen(size: Size) -> Screen {
let mut bus: Bus<ScreenInstruction> = Bus::empty(); let mut bus: Bus<ScreenInstruction> = Bus::empty();
let fake_os_input = FakeInputOutput {}; let fake_os_input = FakeInputOutput {};
bus.os_input = Some(Box::new(fake_os_input)); bus.os_input = Some(Box::new(fake_os_input));
let mut client_attributes = ClientAttributes::default(); let client_attributes = ClientAttributes {
client_attributes.size = size; size,
..Default::default()
};
let max_panes = None; let max_panes = None;
let mode_info = ModeInfo::default(); let mode_info = ModeInfo::default();
let session_state = Arc::new(RwLock::new(SessionState::Attached)); let session_state = Arc::new(RwLock::new(SessionState::Attached));

18
zellij-utils/src/input/config.rs
View file

@ -275,8 +275,10 @@ mod config_test {
#[test] #[test]
fn try_from_cli_args_with_config() { fn try_from_cli_args_with_config() {
let arbitrary_config = PathBuf::from("nonexistent.yaml"); let arbitrary_config = PathBuf::from("nonexistent.yaml");
let mut opts = CliArgs::default(); let opts = CliArgs {
opts.config = Some(arbitrary_config); config: Some(arbitrary_config),
..Default::default()
};
println!("OPTS= {:?}", opts); println!("OPTS= {:?}", opts);
let result = Config::try_from(&opts); let result = Config::try_from(&opts);
assert!(result.is_err()); assert!(result.is_err());
@ -285,11 +287,13 @@ mod config_test {
#[test] #[test]
fn try_from_cli_args_with_option_clean() { fn try_from_cli_args_with_option_clean() {
use crate::setup::Setup; use crate::setup::Setup;
let mut opts = CliArgs::default(); let opts = CliArgs {
opts.command = Some(Command::Setup(Setup { command: Some(Command::Setup(Setup {
clean: true, clean: true,
..Setup::default() ..Setup::default()
})); })),
..Default::default()
};
let result = Config::try_from(&opts); let result = Config::try_from(&opts);
assert!(result.is_ok()); assert!(result.is_ok());
} }

6
zellij-utils/src/input/unit/keybinds_test.rs
View file

@ -92,7 +92,7 @@ fn merge_keybinds_overwrites_same_keys() {
let mut keybinds_self = Keybinds::new(); let mut keybinds_self = Keybinds::new();
keybinds_self keybinds_self
.0 .0
.insert(InputMode::Normal, mode_keybinds_self.clone()); .insert(InputMode::Normal, mode_keybinds_self);
let mut keybinds_other = Keybinds::new(); let mut keybinds_other = Keybinds::new();
keybinds_other keybinds_other
.0 .0
@ -152,7 +152,7 @@ fn no_unbind_unbinds_none() {
fn last_keybind_is_taken() { fn last_keybind_is_taken() {
let actions_1 = vec![Action::NoOp, Action::NewTab(None)]; let actions_1 = vec![Action::NoOp, Action::NewTab(None)];
let keyaction_1 = KeyActionFromYaml { let keyaction_1 = KeyActionFromYaml {
action: actions_1.clone(), action: actions_1,
key: vec![Key::F(1), Key::Backspace, Key::Char('t')], key: vec![Key::F(1), Key::Backspace, Key::Char('t')],
}; };
let actions_2 = vec![Action::GoToTab(1)]; let actions_2 = vec![Action::GoToTab(1)];
@ -184,7 +184,7 @@ fn last_keybind_overwrites() {
let mut expected = ModeKeybinds::new(); let mut expected = ModeKeybinds::new();
expected.0.insert(Key::F(1), actions_2.clone()); expected.0.insert(Key::F(1), actions_2.clone());
expected.0.insert(Key::Backspace, actions_1.clone()); expected.0.insert(Key::Backspace, actions_1);
expected.0.insert(Key::Char('t'), actions_2); expected.0.insert(Key::Char('t'), actions_2);
assert_eq!(expected, ModeKeybinds::from(vec![keyaction_1, keyaction_2])); assert_eq!(expected, ModeKeybinds::from(vec![keyaction_1, keyaction_2]));