Skip to content

Commit 310cca6

Browse files
committed
style: Address warnings
1 parent 5de0c77 commit 310cca6

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

src/cargo.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ pub(crate) fn cargo_runner() -> Option<Vec<String>> {
155155
"CARGO_TARGET_{}_RUNNER",
156156
CURRENT_TARGET.replace('-', "_").to_uppercase()
157157
);
158-
let runner = std::env::var(runner_env).ok()?;
158+
let runner = env::var(runner_env).ok()?;
159159
Some(runner.split(' ').map(str::to_string).collect())
160160
}
161161

@@ -223,7 +223,7 @@ pub fn cargo_bin<S: AsRef<str>>(name: S) -> path::PathBuf {
223223

224224
fn cargo_bin_str(name: &str) -> path::PathBuf {
225225
let env_var = format!("CARGO_BIN_EXE_{}", name);
226-
std::env::var_os(env_var)
226+
env::var_os(env_var)
227227
.map(|p| p.into())
228228
.unwrap_or_else(|| target_dir().join(format!("{}{}", name, env::consts::EXE_SUFFIX)))
229229
}

src/output.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,10 +402,10 @@ fn format_bytes(data: &[u8], f: &mut impl fmt::Write) -> fmt::Result {
402402
}
403403

404404
fn write_debug_bstrs<'a>(
405-
f: &mut impl std::fmt::Write,
405+
f: &mut impl fmt::Write,
406406
multiline: bool,
407407
mut lines: impl Iterator<Item = &'a [u8]>,
408-
) -> std::fmt::Result {
408+
) -> fmt::Result {
409409
if multiline {
410410
writeln!(f, "```")?;
411411
for mut line in lines {

tests/cargo.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
use std::process;
21
use std::process::Command;
32

43
use assert_cmd::prelude::*;
54
use escargot::CURRENT_TARGET;
65

76
#[test]
87
fn cargo_binary() {
9-
let mut cmd = process::Command::cargo_bin("bin_fixture").unwrap();
8+
let mut cmd = Command::cargo_bin("bin_fixture").unwrap();
109
cmd.env("stdout", "42");
1110
cmd.assert().success().stdout("42\n");
1211
}
1312

1413
#[test]
1514
fn cargo_binary_with_empty_env() {
16-
let mut cmd = process::Command::cargo_bin("bin_fixture").unwrap();
15+
let mut cmd = Command::cargo_bin("bin_fixture").unwrap();
1716
cmd.env_clear().env("stdout", "42");
1817
cmd.assert().success().stdout("42\n");
1918
}

0 commit comments

Comments
 (0)