squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Move if-block into closure to reduce duplicate code

Browse source
This commit is contained in:
Preston From 2022-08-02 00:20:12 -06:00
parent d0ea440dfe
commit 298acef307
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_builtin_macros/src/format.rs
View file

@ -81,21 +81,19 @@ impl PositionalNamedArg {
// For the message span, if there is formatting, we want to use the opening `{` and the
// next character, which will the `:` indicating the start of formatting. If there is
// not any formatting, we want to underline the entire span.
if self.has_formatting {
cx.arg_spans.get(self.cur_piece).map_or((None, None), |arg_span| {
cx.arg_spans.get(self.cur_piece).map_or((None, None), |arg_span| {
if self.has_formatting {
(
Some(arg_span.with_lo(arg_span.lo() + BytePos(1)).shrink_to_lo()),
Some(arg_span.with_hi(arg_span.lo() + BytePos(2))),
)
})
} else {
cx.arg_spans.get(self.cur_piece).map_or((None, None), |arg_span| {
} else {
let replace_start = arg_span.lo() + BytePos(1);
let replace_end = arg_span.hi() - BytePos(1);
let to_replace = arg_span.with_lo(replace_start).with_hi(replace_end);
(Some(to_replace), Some(*arg_span))
})
}
}
})
} else {
(None, None)
}