ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cli: relax error type of LogContentFormat::write()

Browse source
This commit is contained in:
Yuya Nishihara 2024-09-03 18:28:00 +09:00
parent 6154827129
commit babdf6b9c1
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cli/src/cli_util.rs
View file

@ -2359,18 +2359,19 @@ impl LogContentFormat {
}
/// Writes content which will optionally be wrapped at the current width.
pub fn write(
pub fn write<E: From<io::Error>>(
&self,
formatter: &mut dyn Formatter,
content_fn: impl FnOnce(&mut dyn Formatter) -> std::io::Result<()>,
) -> std::io::Result<()> {
content_fn: impl FnOnce(&mut dyn Formatter) -> Result<(), E>,
) -> Result<(), E> {
if self.word_wrap {
let mut recorder = FormatRecorder::new();
content_fn(&mut recorder)?;
text_util::write_wrapped(formatter, &recorder, self.width)
text_util::write_wrapped(formatter, &recorder, self.width)?;
} else {
content_fn(formatter)
content_fn(formatter)?;
}
Ok(())
}
}