aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2021-11-16 01:14:04 -0500
committerJesse Luehrs <doy@tozt.net>2021-11-16 01:14:04 -0500
commit1e3ebda4e1d6a2cdfb507cc0ed39aaacf3df0314 (patch)
tree4a66bbaaad6d4fee1d0b4c4abf4f8fe6e2a658c3
parent2da2800028dd5f65a88d26037acb27c8c906cda7 (diff)
downloadvt100-rust-1e3ebda4e1d6a2cdfb507cc0ed39aaacf3df0314.tar.gz
vt100-rust-1e3ebda4e1d6a2cdfb507cc0ed39aaacf3df0314.zip
clippy
-rw-r--r--examples/process.rs2
-rw-r--r--examples/process_diff.rs2
-rw-r--r--examples/process_full.rs2
-rw-r--r--tests/helpers/fixtures.rs2
-rw-r--r--tests/helpers/mod.rs14
-rw-r--r--tests/quickcheck.rs14
-rw-r--r--tests/split-escapes.rs2
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<Item = Vec<u8>> {
fn process_frames(frames: &[Vec<u8>]) {
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<u8>]) {
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<u8>]) {
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: quickcheck::Gen>(g: &mut G) -> Vec<u8> {
Text,
Control,
Escape,
- CSI,
+ Csi,
#[allow(dead_code)]
- OSC,
+ Osc,
#[allow(dead_code)]
- DCS,
+ Dcs,
}
impl rand::distributions::Distribution<Fragment>
@@ -45,7 +45,7 @@ fn choose_terminal_input_fragment<G: quickcheck::Gen>(g: &mut G) -> Vec<u8> {
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: quickcheck::Gen>(g: &mut G) -> Vec<u8> {
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<u8> {
fn write_to_parser(chunks: &mut Vec<Vec<u8>>) -> (String, Vec<u8>) {
let mut parser = vt100::Parser::new(37, 193, 0);
for chunk in chunks.iter_mut() {
- parser.process(&chunk);
+ parser.process(chunk);
}
(
parser.screen().contents(),