From 310cca616b6b558fae81b8747089c979338c348d Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 2 May 2024 09:16:00 -0500 Subject: [PATCH] style: Address warnings --- src/cargo.rs | 4 ++-- src/output.rs | 4 ++-- tests/cargo.rs | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/cargo.rs b/src/cargo.rs index b69d80c..27da82e 100644 --- a/src/cargo.rs +++ b/src/cargo.rs @@ -155,7 +155,7 @@ pub(crate) fn cargo_runner() -> Option> { "CARGO_TARGET_{}_RUNNER", CURRENT_TARGET.replace('-', "_").to_uppercase() ); - let runner = std::env::var(runner_env).ok()?; + let runner = env::var(runner_env).ok()?; Some(runner.split(' ').map(str::to_string).collect()) } @@ -223,7 +223,7 @@ pub fn cargo_bin>(name: S) -> path::PathBuf { fn cargo_bin_str(name: &str) -> path::PathBuf { let env_var = format!("CARGO_BIN_EXE_{}", name); - std::env::var_os(env_var) + env::var_os(env_var) .map(|p| p.into()) .unwrap_or_else(|| target_dir().join(format!("{}{}", name, env::consts::EXE_SUFFIX))) } diff --git a/src/output.rs b/src/output.rs index b511c75..e072f19 100644 --- a/src/output.rs +++ b/src/output.rs @@ -402,10 +402,10 @@ fn format_bytes(data: &[u8], f: &mut impl fmt::Write) -> fmt::Result { } fn write_debug_bstrs<'a>( - f: &mut impl std::fmt::Write, + f: &mut impl fmt::Write, multiline: bool, mut lines: impl Iterator, -) -> std::fmt::Result { +) -> fmt::Result { if multiline { writeln!(f, "```")?; for mut line in lines { diff --git a/tests/cargo.rs b/tests/cargo.rs index 26c2492..5f074a5 100644 --- a/tests/cargo.rs +++ b/tests/cargo.rs @@ -1,4 +1,3 @@ -use std::process; use std::process::Command; use assert_cmd::prelude::*; @@ -6,14 +5,14 @@ use escargot::CURRENT_TARGET; #[test] fn cargo_binary() { - let mut cmd = process::Command::cargo_bin("bin_fixture").unwrap(); + let mut cmd = Command::cargo_bin("bin_fixture").unwrap(); cmd.env("stdout", "42"); cmd.assert().success().stdout("42\n"); } #[test] fn cargo_binary_with_empty_env() { - let mut cmd = process::Command::cargo_bin("bin_fixture").unwrap(); + let mut cmd = Command::cargo_bin("bin_fixture").unwrap(); cmd.env_clear().env("stdout", "42"); cmd.assert().success().stdout("42\n"); }