diff options
author | cyqsimon <28627918+cyqsimon@users.noreply.github.com> | 2023-08-14 18:47:08 +0800 |
---|---|---|
committer | cyqsimon <28627918+cyqsimon@users.noreply.github.com> | 2023-08-14 18:47:08 +0800 |
commit | ac8ee79cc1236f5f5679125af4441dbae5fe3c04 (patch) | |
tree | 2737d2476f0c163a54916dda859a734ce3c93fb1 /src/tests/cases | |
parent | 3550d86f927542376a60cd8ca361838ee445404a (diff) |
Bump incompatible deps
- Binary build is fixed, but `packet_builder` crate seems to have some issues
Diffstat (limited to 'src/tests/cases')
-rw-r--r-- | src/tests/cases/raw_mode.rs | 6 | ||||
-rw-r--r-- | src/tests/cases/test_utils.rs | 16 | ||||
-rw-r--r-- | src/tests/cases/ui.rs | 40 |
3 files changed, 30 insertions, 32 deletions
diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs index bee763d..a2f98dd 100644 --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -6,10 +6,8 @@ use ::std::sync::{Arc, Mutex}; use ::std::collections::HashMap; use ::std::net::IpAddr; -use packet_builder::payload::PayloadData; -use packet_builder::*; -use pnet::datalink::DataLinkReceiver; -use pnet::packet::Packet; +use packet_builder::{payload::PayloadData, *}; +use pnet::{datalink::DataLinkReceiver, packet::Packet}; use crate::tests::cases::test_utils::{ build_tcp_packet, opts_raw, os_input_output_dns, os_input_output_stdout, test_backend_factory, diff --git a/src/tests/cases/test_utils.rs b/src/tests/cases/test_utils.rs index ab8e502..8a8a338 100644 --- a/src/tests/cases/test_utils.rs +++ b/src/tests/cases/test_utils.rs @@ -19,20 +19,20 @@ use pnet_base::MacAddr; pub fn sleep_and_quit_events(sleep_num: usize) -> Box<TerminalEvents> { let mut events: Vec<Option<Event>> = iter::repeat(None).take(sleep_num).collect(); - events.push(Some(Event::Key(KeyEvent { - modifiers: KeyModifiers::CONTROL, - code: KeyCode::Char('c'), - }))); + events.push(Some(Event::Key(KeyEvent::new( + KeyCode::Char('c'), + KeyModifiers::CONTROL, + )))); Box::new(TerminalEvents::new(events)) } pub fn sleep_resize_and_quit_events(sleep_num: usize) -> Box<TerminalEvents> { let mut events: Vec<Option<Event>> = iter::repeat(None).take(sleep_num).collect(); events.push(Some(Event::Resize(100, 100))); - events.push(Some(Event::Key(KeyEvent { - modifiers: KeyModifiers::CONTROL, - code: KeyCode::Char('c'), - }))); + events.push(Some(Event::Key(KeyEvent::new( + KeyCode::Char('c'), + KeyModifiers::CONTROL, + )))); Box::new(TerminalEvents::new(events)) } diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs index 14bf861..ce12319 100644 --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -68,20 +68,20 @@ fn pause_by_space() { // sleep for 1s, then press space, sleep for 2s, then quit let mut events: Vec<Option<Event>> = iter::repeat(None).take(1).collect(); - events.push(Some(Event::Key(KeyEvent { - modifiers: KeyModifiers::NONE, - code: KeyCode::Char(' '), - }))); + events.push(Some(Event::Key(KeyEvent::new( + KeyCode::Char(' '), + KeyModifiers::NONE, + )))); events.push(None); events.push(None); - events.push(Some(Event::Key(KeyEvent { - modifiers: KeyModifiers::NONE, - code: KeyCode::Char(' '), - }))); - events.push(Some(Event::Key(KeyEvent { - modifiers: KeyModifiers::CONTROL, - code: KeyCode::Char('c'), - }))); + events.push(Some(Event::Key(KeyEvent::new( + KeyCode::Char(' '), + KeyModifiers::NONE, + )))); + events.push(Some(Event::Key(KeyEvent::new( + KeyCode::Char('c'), + KeyModifiers::CONTROL, + )))); let events = Box::new(TerminalEvents::new(events)); let os_input = os_input_output_factory(network_frames, None, None, events); @@ -128,16 +128,16 @@ fn rearranged_by_tab() { // sleep for 1s, then press tab, sleep for 2s, then quit let mut events: Vec<Option<Event>> = iter::repeat(None).take(1).collect(); events.push(None); - events.push(Some(Event::Key(KeyEvent { - modifiers: KeyModifiers::NONE, - code: KeyCode::Tab, - }))); + events.push(Some(Event::Key(KeyEvent::new( + KeyCode::Tab, + KeyModifiers::NONE, + )))); events.push(None); events.push(None); - events.push(Some(Event::Key(KeyEvent { - modifiers: KeyModifiers::CONTROL, - code: KeyCode::Char('c'), - }))); + events.push(Some(Event::Key(KeyEvent::new( + KeyCode::Char('c'), + KeyModifiers::CONTROL, + )))); let events = Box::new(TerminalEvents::new(events)); let os_input = os_input_output_factory(network_frames, None, None, events); |