diff options
| author | bors <bors@rust-lang.org> | 2019-01-22 13:40:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-22 13:40:01 +0000 |
| commit | ad30e9a6814b5d29dfbdcd85ecde48afcc94389b (patch) | |
| tree | 0e358d32a69cc6c584211e87fd412d8f3cb505fb /src/libsyntax_ext | |
| parent | 76c87a166fa8ca247855ea6c32465d627d1ead14 (diff) | |
| parent | dec7b7b1315a073c40c253cc9c80fc693422e3bf (diff) | |
| download | rust-ad30e9a6814b5d29dfbdcd85ecde48afcc94389b.tar.gz rust-ad30e9a6814b5d29dfbdcd85ecde48afcc94389b.zip | |
Auto merge of #57830 - Centril:rollup, r=Centril
Rollup of 9 pull requests Successful merges: - #57537 (Small perf improvement for fmt) - #57552 (Default images) - #57604 (Make `str` indexing generic on `SliceIndex`.) - #57667 (Fix memory leak in P::filter_map) - #57677 (const_eval: Predetermine the layout of all locals when pushing a stack frame) - #57791 (Add regression test for #54582) - #57798 (Corrected spelling inconsistency) - #57809 (Add powerpc64-unknown-freebsd) - #57813 (fix validation range printing when encountering undef) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/format.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libsyntax_ext/format.rs b/src/libsyntax_ext/format.rs index 3e3bca7080f..215df4224c5 100644 --- a/src/libsyntax_ext/format.rs +++ b/src/libsyntax_ext/format.rs @@ -493,7 +493,10 @@ impl<'a, 'b> Context<'a, 'b> { let fill = arg.format.fill.unwrap_or(' '); - if *arg != simple_arg || fill != ' ' { + let pos_simple = + arg.position.index() == simple_arg.position.index(); + + if !pos_simple || arg.format != simple_arg.format || fill != ' ' { self.all_pieces_simple = false; } |