Skip to content

Commit 6a3d089

Browse files
committed
fix(tee): rename Error parameter in process_error
1 parent 5338401 commit 6a3d089

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

src/uu/tee/src/tee.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ impl MultiWriter {
201201

202202
fn process_error(
203203
mode: Option<&OutputErrorMode>,
204-
f: Error,
204+
e: Error,
205205
writer: &NamedWriter,
206206
ignored_errors: &mut usize,
207207
) -> Result<()> {
@@ -210,12 +210,12 @@ fn process_error(
210210
None | Some(OutputErrorMode::WarnNoPipe) | Some(OutputErrorMode::ExitNoPipe)
211211
);
212212

213-
if ignore_pipe && f.kind() == ErrorKind::BrokenPipe {
213+
if ignore_pipe && e.kind() == ErrorKind::BrokenPipe {
214214
return Ok(());
215215
}
216-
let _ = writeln!(stderr(), "{}: {f}", writer.name.maybe_quote());
216+
let _ = writeln!(stderr(), "{}: {e}", writer.name.maybe_quote());
217217
if let Some(OutputErrorMode::Exit | OutputErrorMode::ExitNoPipe) = mode {
218-
Err(f)
218+
Err(e)
219219
} else {
220220
*ignored_errors += 1;
221221
Ok(())
@@ -256,8 +256,8 @@ impl Write for MultiWriter {
256256
self.writers.retain_mut(|writer| {
257257
writer
258258
.flush()
259-
.map_err(|f| {
260-
let _ = process_error(mode.as_ref(), f, writer, &mut errors)
259+
.map_err(|e| {
260+
let _ = process_error(mode.as_ref(), e, writer, &mut errors)
261261
.map_err(|e| aborted.get_or_insert(e));
262262
})
263263
.is_ok()

0 commit comments

Comments
 (0)