mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-25 16:09:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

cli: remove useless Box wrapper from buffered formatter

Browse source
This commit is contained in:
Yuya Nishihara 2022-10-07 20:57:35 +09:00
parent 3392e83486
commit 7e83b30d8e
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/commands.rs
View file

@ -2113,8 +2113,7 @@ fn cmd_log(ui: &mut Ui, command: &CommandHelper, args: &LogArgs) -> Result<(), C
let commit = store.get_commit(&commit_id)?;
let is_checkout = Some(&commit_id) == checkout_id;
{
let writer = Box::new(&mut buffer);
let mut formatter = ui.new_formatter(writer);
let mut formatter = ui.new_formatter(&mut buffer);
if is_checkout {
formatter.add_label("working_copy")?;
}
@ -2127,8 +2126,7 @@ fn cmd_log(ui: &mut Ui, command: &CommandHelper, args: &LogArgs) -> Result<(), C
buffer.push(b'\n');
}
if let Some(diff_format) = diff_format {
let writer = Box::new(&mut buffer);
let mut formatter = ui.new_formatter(writer);
let mut formatter = ui.new_formatter(&mut buffer);
show_patch(
formatter.as_mut(),
&workspace_command,
@ -2224,16 +2222,14 @@ fn cmd_obslog(ui: &mut Ui, command: &CommandHelper, args: &ObslogArgs) -> Result
}
let mut buffer = vec![];
{
let writer = Box::new(&mut buffer);
let mut formatter = ui.new_formatter(writer);
let mut formatter = ui.new_formatter(&mut buffer);
template.format(&commit, formatter.as_mut())?;
}
if !buffer.ends_with(b"\n") {
buffer.push(b'\n');
}
if let Some(diff_format) = diff_format {
let writer = Box::new(&mut buffer);
let mut formatter = ui.new_formatter(writer);
let mut formatter = ui.new_formatter(&mut buffer);
show_predecessor_patch(
formatter.as_mut(),
&workspace_command,
@ -3653,8 +3649,7 @@ fn cmd_op_log(
let is_head_op = op.id() == &head_op_id;
let mut buffer = vec![];
{
let writer = Box::new(&mut buffer);
let mut formatter = ui.new_formatter(writer);
let mut formatter = ui.new_formatter(&mut buffer);
formatter.add_label("op-log")?;
if is_head_op {
formatter.add_label("head")?;

4
src/ui.rs
View file

@ -129,9 +129,9 @@ impl<'stdout> Ui<'stdout> {
&self.settings
}
pub fn new_formatter<'output>(
pub fn new_formatter<'output, W: Write + 'output>(
&self,
output: Box<dyn Write + 'output>,
output: W,
) -> Box<dyn Formatter + 'output> {
self.formatter_factory.new_formatter(output)
}