Skip to content

tee: use is_ok at fn write_flush #11950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
oech3 wants to merge 1 commit into from
+5 −10
Closed

tee: use is_ok at fn write_flush #11950

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions src/uu/tee/src/tee.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,24 +195,19 @@ impl MultiWriter {

fn write_flush(&mut self, buf: &[u8]) -> Result<()> {
let mut aborted = None;
let mut errors = 0;
let mode = self.output_error_mode;
self.writers.retain_mut(|writer| {
let res = (|| {
writer.inner.write_all(buf)?;
writer.inner.flush()
})();
match res {
Ok(()) => true,
Err(e) => {
if let Err(e) = process_error(mode, e, writer, &mut errors) {
aborted.get_or_insert(e);
}
false
res.map_err(|e| {
if let Err(e) = process_error(mode, e, writer, &mut self.ignored_errors) {
aborted.get_or_insert(e);
}
}
})
.is_ok()
Comment on lines +204 to +209
Copy link
Copy Markdown
Contributor

@xtqqczze xtqqczze Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
res.map_err(|e| {
if let Err(e) = process_error(mode, e, writer, &mut self.ignored_errors) {
aborted.get_or_insert(e);
}
}
})
.is_ok()
if let Err(e) = res {
if let Err(e) = process_error(mode, e, writer, &mut self.ignored_errors) {
aborted.get_or_insert(e);
}
false
} else {
true
}

Copy link
Copy Markdown
Contributor Author

@oech3 oech3 Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. It manually returns true and false instead of reusing bool.

});
self.ignored_errors += errors;
aborted.map_or(
if self.writers.is_empty() {
// This error kind will never be raised by the standard
Expand Down
Loading