Skip to content

Commit e63547a

Browse files
committed
fix(tee): rename Error parameter in process_error
1 parent 451844f commit e63547a

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/uu/tee/src/tee.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -204,33 +204,33 @@ impl MultiWriter {
204204

205205
fn process_error(
206206
mode: Option<&OutputErrorMode>,
207-
f: Error,
207+
e: Error,
208208
writer: &NamedWriter,
209209
ignored_errors: &mut usize,
210210
) -> Result<()> {
211211
match mode {
212212
Some(OutputErrorMode::Warn) => {
213-
let _ = writeln!(stderr(), "{}: {f}", writer.name.maybe_quote());
213+
let _ = writeln!(stderr(), "{}: {e}", writer.name.maybe_quote());
214214
*ignored_errors += 1;
215215
Ok(())
216216
}
217217
Some(OutputErrorMode::WarnNoPipe) | None => {
218-
if f.kind() != ErrorKind::BrokenPipe {
219-
let _ = writeln!(stderr(), "{}: {f}", writer.name.maybe_quote());
218+
if e.kind() != ErrorKind::BrokenPipe {
219+
let _ = writeln!(stderr(), "{}: {e}", writer.name.maybe_quote());
220220
*ignored_errors += 1;
221221
}
222222
Ok(())
223223
}
224224
Some(OutputErrorMode::Exit) => {
225-
let _ = writeln!(stderr(), "{}: {f}", writer.name.maybe_quote());
226-
Err(f)
225+
let _ = writeln!(stderr(), "{}: {e}", writer.name.maybe_quote());
226+
Err(e)
227227
}
228228
Some(OutputErrorMode::ExitNoPipe) => {
229-
if f.kind() == ErrorKind::BrokenPipe {
229+
if e.kind() == ErrorKind::BrokenPipe {
230230
Ok(())
231231
} else {
232-
let _ = writeln!(stderr(), "{}: {f}", writer.name.maybe_quote());
233-
Err(f)
232+
let _ = writeln!(stderr(), "{}: {e}", writer.name.maybe_quote());
233+
Err(e)
234234
}
235235
}
236236
}
@@ -246,8 +246,8 @@ impl MultiWriter {
246246
let mut errors = 0;
247247
self.writers.retain_mut(|writer| match f(writer) {
248248
Ok(()) => true,
249-
Err(f) => {
250-
if let Err(e) = process_error(mode.as_ref(), f, writer, &mut errors) {
249+
Err(e) => {
250+
if let Err(e) = process_error(mode.as_ref(), e, writer, &mut errors) {
251251
aborted.get_or_insert(e);
252252
}
253253
false

0 commit comments

Comments
 (0)