From 0cf00851dc88ed8013a35747c803b6c83db83761 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sun, 5 Feb 2023 14:09:08 -0500 Subject: clippy --- examples/fuzz.rs | 2 +- examples/generate_fixture.rs | 12 +++++------- examples/generate_fuzz.rs | 6 +++--- examples/process.rs | 4 ++-- examples/process_diff.rs | 4 ++-- examples/process_full.rs | 4 ++-- examples/real_terminal_compare.rs | 2 +- examples/vte.rs | 12 +++++------- 8 files changed, 21 insertions(+), 25 deletions(-) (limited to 'examples') diff --git a/examples/fuzz.rs b/examples/fuzz.rs index 6283102..576af2c 100644 --- a/examples/fuzz.rs +++ b/examples/fuzz.rs @@ -90,7 +90,7 @@ fn read_byte() -> Option { } } Err(e) => { - eprintln!("{}", e); + eprintln!("{e}"); return None; } } diff --git a/examples/generate_fixture.rs b/examples/generate_fixture.rs index 5cbf8d0..2f82617 100644 --- a/examples/generate_fixture.rs +++ b/examples/generate_fixture.rs @@ -6,11 +6,11 @@ mod helpers; fn main() { let name = std::env::args().nth(1).unwrap(); - let _ = std::fs::remove_dir_all(format!("tests/data/fixtures/{}", name)); - std::fs::create_dir_all(format!("tests/data/fixtures/{}", name)).unwrap(); + let _ = std::fs::remove_dir_all(format!("tests/data/fixtures/{name}")); + std::fs::create_dir_all(format!("tests/data/fixtures/{name}")).unwrap(); let inputs = - std::fs::File::open(format!("tests/data/fixtures/{}.in", name)) + std::fs::File::open(format!("tests/data/fixtures/{name}.in")) .unwrap(); let inputs = std::io::BufReader::new(inputs); @@ -21,8 +21,7 @@ fn main() { let input = helpers::unhex(line.as_bytes()); let mut input_file = std::fs::File::create(format!( - "tests/data/fixtures/{}/{}.typescript", - name, i + "tests/data/fixtures/{name}/{i}.typescript" )) .unwrap(); input_file.write_all(&input).unwrap(); @@ -33,8 +32,7 @@ fn main() { let screen = helpers::FixtureScreen::from_screen(term.screen()); let output_file = std::fs::File::create(format!( - "tests/data/fixtures/{}/{}.json", - name, i + "tests/data/fixtures/{name}/{i}.json" )) .unwrap(); serde_json::to_writer_pretty(output_file, &screen).unwrap(); diff --git a/examples/generate_fuzz.rs b/examples/generate_fuzz.rs index 92c983b..c51402b 100644 --- a/examples/generate_fuzz.rs +++ b/examples/generate_fuzz.rs @@ -6,10 +6,10 @@ mod helpers; fn main() { let name = std::env::args().nth(1).unwrap(); - let _ = std::fs::remove_file(format!("fuzz/in/{}", name)); + let _ = std::fs::remove_file(format!("fuzz/in/{name}")); let inputs = - std::fs::File::open(format!("tests/data/fixtures/{}.in", name)) + std::fs::File::open(format!("tests/data/fixtures/{name}.in")) .unwrap(); let inputs = std::io::BufReader::new(inputs); @@ -20,6 +20,6 @@ fn main() { bytes.extend(input.iter()); } let mut input_file = - std::fs::File::create(format!("fuzz/in/{}", name)).unwrap(); + std::fs::File::create(format!("fuzz/in/{name}")).unwrap(); input_file.write_all(&bytes).unwrap(); } diff --git a/examples/process.rs b/examples/process.rs index 333f124..aae215c 100644 --- a/examples/process.rs +++ b/examples/process.rs @@ -3,7 +3,7 @@ use std::io::Read as _; fn read_frames() -> impl Iterator> { (1..=7625).map(|i| { let mut file = - std::fs::File::open(format!("tests/data/crawl/crawl{}", i)) + std::fs::File::open(format!("tests/data/crawl/crawl{i}")) .unwrap(); let mut frame = vec![]; file.read_to_end(&mut frame).unwrap(); @@ -29,5 +29,5 @@ fn main() { break; } } - eprintln!("{} iterations", i); + eprintln!("{i} iterations"); } diff --git a/examples/process_diff.rs b/examples/process_diff.rs index 84ab71c..e9d68a9 100644 --- a/examples/process_diff.rs +++ b/examples/process_diff.rs @@ -3,7 +3,7 @@ use std::io::{Read as _, Write as _}; fn read_frames() -> impl Iterator> { (1..=7625).map(|i| { let mut file = - std::fs::File::open(format!("tests/data/crawl/crawl{}", i)) + std::fs::File::open(format!("tests/data/crawl/crawl{i}")) .unwrap(); let mut frame = vec![]; file.read_to_end(&mut frame).unwrap(); @@ -35,5 +35,5 @@ fn main() { break; } } - eprintln!("{} iterations", i); + eprintln!("{i} iterations"); } diff --git a/examples/process_full.rs b/examples/process_full.rs index fca87c7..5b733eb 100644 --- a/examples/process_full.rs +++ b/examples/process_full.rs @@ -3,7 +3,7 @@ use std::io::{Read as _, Write as _}; fn read_frames() -> impl Iterator> { (1..=7625).map(|i| { let mut file = - std::fs::File::open(format!("tests/data/crawl/crawl{}", i)) + std::fs::File::open(format!("tests/data/crawl/crawl{i}")) .unwrap(); let mut frame = vec![]; file.read_to_end(&mut frame).unwrap(); @@ -32,5 +32,5 @@ fn main() { break; } } - eprintln!("{} iterations", i); + eprintln!("{i} iterations"); } diff --git a/examples/real_terminal_compare.rs b/examples/real_terminal_compare.rs index e9ac92b..ce87a70 100644 --- a/examples/real_terminal_compare.rs +++ b/examples/real_terminal_compare.rs @@ -126,7 +126,7 @@ fn main() { } } Err(e) => { - eprintln!("{}", e); + eprintln!("{e}"); std::process::exit(1); } } diff --git a/examples/vte.rs b/examples/vte.rs index e7db674..e6d0f55 100644 --- a/examples/vte.rs +++ b/examples/vte.rs @@ -9,7 +9,7 @@ impl vte::Perform for Log { } fn execute(&mut self, byte: u8) { - println!("[execute] {:02x}", byte); + println!("[execute] {byte:02x}"); } fn hook( @@ -26,7 +26,7 @@ impl vte::Perform for Log { } fn put(&mut self, byte: u8) { - println!("[put] {:02x}", byte); + println!("[put] {byte:02x}"); } fn unhook(&mut self) { @@ -35,8 +35,7 @@ impl vte::Perform for Log { fn osc_dispatch(&mut self, params: &[&[u8]], bell_terminated: bool) { println!( - "[osc_dispatch] params={:?} bell_terminated={}", - params, bell_terminated + "[osc_dispatch] params={params:?} bell_terminated={bell_terminated}" ); } @@ -56,8 +55,7 @@ impl vte::Perform for Log { fn esc_dispatch(&mut self, intermediates: &[u8], ignore: bool, byte: u8) { println!( - "[esc_dispatch] intermediates={:?}, ignore={:?}, byte={:02x}", - intermediates, ignore, byte + "[esc_dispatch] intermediates={intermediates:?}, ignore={ignore:?}, byte={byte:02x}" ); } } @@ -77,7 +75,7 @@ fn main() { } } Err(err) => { - eprintln!("err: {}", err); + eprintln!("err: {err}"); std::process::exit(1); } } -- cgit v1.2.3-54-g00ecf