From ce4e668e39f710dae60c3d476eb594aebd9da11c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96mer=20Sinan=20A=C4=9Facan?= <omeragacan@gmail.com>
Date: Sun, 21 Mar 2021 17:29:21 +0300
Subject: [PATCH] format macro argument parsing fix

When the character next to `{}` is "shifted" (when mapping a byte index
in the format string to span) we should avoid shifting the span end
index, so first map the index of `}` to span, then bump the span,
instead of first mapping the next byte index to a span (which causes
bumping the end span too much).

Regression test added.

Fixes #83344
---
 tests/ui/write_literal_2.stderr | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/ui/write_literal_2.stderr b/tests/ui/write_literal_2.stderr
index 5b488358011..0aa1b55e58c 100644
--- a/tests/ui/write_literal_2.stderr
+++ b/tests/ui/write_literal_2.stderr
@@ -75,8 +75,9 @@ LL |         "1", "2", "3",
    |
 help: try this
    |
-LL |         "some 1{} / {}", "2", "3",
-   |               ^        --
+LL |         "some 1/
+LL |         {} / {}", "2", "3",
+   |
 
 error: literal with an empty format string
   --> $DIR/write_literal_2.rs:25:14