From 1e3ebda4e1d6a2cdfb507cc0ed39aaacf3df0314 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Tue, 16 Nov 2021 01:14:04 -0500 Subject: clippy --- examples/process.rs | 2 +- examples/process_diff.rs | 2 +- examples/process_full.rs | 2 +- tests/helpers/fixtures.rs | 2 +- tests/helpers/mod.rs | 14 +++++++------- tests/quickcheck.rs | 14 +++++++------- tests/split-escapes.rs | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/examples/process.rs b/examples/process.rs index d8d6886..333f124 100644 --- a/examples/process.rs +++ b/examples/process.rs @@ -14,7 +14,7 @@ fn read_frames() -> impl Iterator> { fn process_frames(frames: &[Vec]) { let mut parser = vt100::Parser::default(); for frame in frames { - parser.process(&frame); + parser.process(frame); } } diff --git a/examples/process_diff.rs b/examples/process_diff.rs index c141269..84ab71c 100644 --- a/examples/process_diff.rs +++ b/examples/process_diff.rs @@ -16,7 +16,7 @@ fn draw_frames(frames: &[Vec]) { let mut parser = vt100::Parser::default(); let mut screen = parser.screen().clone(); for frame in frames { - parser.process(&frame); + parser.process(frame); let new_screen = parser.screen().clone(); let diff = new_screen.contents_diff(&screen); stdout.write_all(&diff).unwrap(); diff --git a/examples/process_full.rs b/examples/process_full.rs index 5aa5422..fca87c7 100644 --- a/examples/process_full.rs +++ b/examples/process_full.rs @@ -15,7 +15,7 @@ fn draw_frames(frames: &[Vec]) { let mut stdout = std::io::stdout(); let mut parser = vt100::Parser::default(); for frame in frames { - parser.process(&frame); + parser.process(frame); let contents = parser.screen().contents_formatted(); stdout.write_all(&contents).unwrap(); } diff --git a/tests/helpers/fixtures.rs b/tests/helpers/fixtures.rs index 8f9bfdb..f2076fb 100644 --- a/tests/helpers/fixtures.rs +++ b/tests/helpers/fixtures.rs @@ -285,7 +285,7 @@ fn assert_produces(input: &[u8], expected: &FixtureScreen) { .cells .get(&format!("{},{}", row, col)) .cloned() - .unwrap_or_else(FixtureCell::default); + .unwrap_or_default(); let got_cell = parser.screen().cell(row, col).unwrap(); assert_eq!(got_cell.contents(), expected_cell.contents); assert_eq!(got_cell.is_wide(), expected_cell.is_wide); diff --git a/tests/helpers/mod.rs b/tests/helpers/mod.rs index bbf1114..daf18dd 100644 --- a/tests/helpers/mod.rs +++ b/tests/helpers/mod.rs @@ -92,7 +92,7 @@ pub fn contents_formatted_reproduces_screen(screen: &vt100::Screen) -> bool { new_parser.process(&new_input); let got_screen = new_parser.screen().clone(); - compare_screens(&got_screen, &screen) + compare_screens(&got_screen, screen) } fn assert_contents_formatted_reproduces_state(input: &[u8]) { @@ -120,11 +120,11 @@ pub fn contents_diff_reproduces_state_from_screens( prev_screen: &vt100::Screen, screen: &vt100::Screen, ) -> bool { - let mut diff_input = screen.contents_diff(&prev_screen); - diff_input.extend(screen.input_mode_diff(&prev_screen)); - diff_input.extend(screen.title_diff(&prev_screen)); - diff_input.extend(screen.bells_diff(&prev_screen)); - assert_eq!(diff_input, screen.state_diff(&prev_screen)); + let mut diff_input = screen.contents_diff(prev_screen); + diff_input.extend(screen.input_mode_diff(prev_screen)); + diff_input.extend(screen.title_diff(prev_screen)); + diff_input.extend(screen.bells_diff(prev_screen)); + assert_eq!(diff_input, screen.state_diff(prev_screen)); let mut diff_prev_input = prev_screen.contents_formatted(); diff_prev_input.extend(screen.input_mode_formatted()); @@ -137,7 +137,7 @@ pub fn contents_diff_reproduces_state_from_screens( new_parser.process(&diff_input); let got_screen = new_parser.screen().clone(); - compare_screens(&got_screen, &screen) + compare_screens(&got_screen, screen) } #[allow(dead_code)] diff --git a/tests/quickcheck.rs b/tests/quickcheck.rs index ef94e5e..64fd027 100644 --- a/tests/quickcheck.rs +++ b/tests/quickcheck.rs @@ -30,11 +30,11 @@ fn choose_terminal_input_fragment(g: &mut G) -> Vec { Text, Control, Escape, - CSI, + Csi, #[allow(dead_code)] - OSC, + Osc, #[allow(dead_code)] - DCS, + Dcs, } impl rand::distributions::Distribution @@ -45,7 +45,7 @@ fn choose_terminal_input_fragment(g: &mut G) -> Vec { 0u8..=231 => Fragment::Text, 232..=239 => Fragment::Control, 240..=247 => Fragment::Escape, - 248..=255 => Fragment::CSI, + 248..=255 => Fragment::Csi, } } } @@ -73,18 +73,18 @@ fn choose_terminal_input_fragment(g: &mut G) -> Vec { v.push(c); v } - Fragment::CSI => { + Fragment::Csi => { let mut v = vec![0x1b, b'[']; // TODO: params let c = g.gen_range(b'@', b'~'); v.push(c); v } - Fragment::OSC => { + Fragment::Osc => { // TODO unimplemented!() } - Fragment::DCS => { + Fragment::Dcs => { // TODO unimplemented!() } diff --git a/tests/split-escapes.rs b/tests/split-escapes.rs index 097aa6f..fa5b6b1 100644 --- a/tests/split-escapes.rs +++ b/tests/split-escapes.rs @@ -10,7 +10,7 @@ fn get_file_contents(name: &str) -> Vec { fn write_to_parser(chunks: &mut Vec>) -> (String, Vec) { let mut parser = vt100::Parser::new(37, 193, 0); for chunk in chunks.iter_mut() { - parser.process(&chunk); + parser.process(chunk); } ( parser.screen().contents(), -- cgit v1.2.3-54-g00ecf