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

rustfmt: format string literals

Browse source
This commit is contained in:
Martin von Zweigbergk 2021-08-28 21:46:45 -07:00
parent 88fef10eac
commit 4e9be8d2a4
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
rustfmt.toml
View file

@ -1,5 +1,6 @@
max_width = 100 max_width = 100
wrap_comments = true wrap_comments = true
format_strings = true
error_on_line_overflow = true error_on_line_overflow = true
group_imports = "StdExternalCrate" group_imports = "StdExternalCrate"
imports_granularity = "Module" imports_granularity = "Module"

22
src/commands.rs
View file

@ -393,7 +393,12 @@ impl RepoCommandHelper {
Some(RefTarget::Conflict { adds, .. }) => { Some(RefTarget::Conflict { adds, .. }) => {
for current_target in adds { for current_target in adds {
if current_target == old_checkout { if current_target == old_checkout {
writeln!(ui, "Branch {}'s target was rewritten, but not updating it since it's conflicted", branch_name)?; writeln!(
ui,
"Branch {}'s target was rewritten, but not updating it \
since it's conflicted",
branch_name
)?;
} }
} }
} }
@ -415,7 +420,8 @@ impl RepoCommandHelper {
if evolve_result.num_failed > 0 { if evolve_result.num_failed > 0 {
writeln!( writeln!(
ui, ui,
"Failed to rebase {} descendant commits onto updated working copy (run `jj evolve`)", "Failed to rebase {} descendant commits onto updated working copy (run \
`jj evolve`)",
evolve_result.num_failed evolve_result.num_failed
)?; )?;
} }
@ -730,7 +736,12 @@ fn update_branches_after_rewrite(ui: &mut Ui, mut_repo: &mut MutableRepo) -> io:
if new_evolution.is_obsolete(current_target) if new_evolution.is_obsolete(current_target)
&& !old_evolution.is_obsolete(current_target) && !old_evolution.is_obsolete(current_target)
{ {
writeln!(ui, "Branch {}'s target was obsoleted, but not updating it since it's conflicted", branch_name )?; writeln!(
ui,
"Branch {}'s target was obsoleted, but not updating it since it's \
conflicted",
branch_name
)?;
} }
} }
} }
@ -985,7 +996,10 @@ fn get_app<'a, 'b>() -> App<'a, 'b> {
) )
.subcommand( .subcommand(
SubCommand::with_name("walkrevs") SubCommand::with_name("walkrevs")
.about("Walk revisions that are ancestors of the second argument but not ancestors of the first") .about(
"Walk revisions that are ancestors of the second argument but not ancestors \
of the first",
)
.arg(Arg::with_name("unwanted").index(1).required(true)) .arg(Arg::with_name("unwanted").index(1).required(true))
.arg(Arg::with_name("wanted").index(2).required(true)), .arg(Arg::with_name("wanted").index(2).required(true)),
) )