Fixing suggestions

Author: kper

compiler/rustc_expand/src/base.rs

@@ -1229,7 +1229,7 @@ pub fn expr_to_spanned_string<'a>(
             ast::LitKind::ByteStr(_) => {
                 let mut err = cx.struct_span_err(l.span, err_msg);
                 err.span_suggestion(
-                    expr.span.shrink_to_lo(),
+                    expr.span,
                     "consider removing the leading `b`",
                     "",
                     Applicability::MaybeIncorrect,

src/test/ui/macros/issue-86865.stderr

@@ -2,17 +2,13 @@ error: format argument must be a string literal
   --> $DIR/issue-86865.rs:4:14
    |
 LL |     println!(b"foo");
-   |              -^^^^^
-   |              |
-   |              help: consider removing the leading `b`
+   |              ^^^^^^ help: consider removing the leading `b`
 
 error: format argument must be a string literal
   --> $DIR/issue-86865.rs:8:15
    |
 LL |     write!(s, b"foo{}", "bar");
-   |               -^^^^^^^
-   |               |
-   |               help: consider removing the leading `b`
+   |               ^^^^^^^^ help: consider removing the leading `b`
 
 error: aborting due to 2 previous errors
 

src/test/ui/parser/increment-notfixed.stderr

@@ -8,8 +8,6 @@ help: use `+= 1` instead
    |
 LL |     { let tmp = i; i += 1; tmp };
    |     +++++++++++  ~~~~~~~~~~~~~~~
-LL |     i += 1;
-   |       ~~~~
 
 error: Rust has no postfix increment operator
   --> $DIR/increment-notfixed.rs:17:12
@@ -23,8 +21,6 @@ help: use `+= 1` instead
    |
 LL |     while { let tmp = i; i += 1; tmp } < 5 {
    |           +++++++++++  ~~~~~~~~~~~~~~~
-LL |     while i += 1 < 5 {
-   |             ~~~~
 
 error: Rust has no postfix increment operator
   --> $DIR/increment-notfixed.rs:25:8
@@ -36,8 +32,6 @@ help: use `+= 1` instead
    |
 LL |     { let tmp_ = tmp; tmp += 1; tmp_ };
    |     ++++++++++++    ~~~~~~~~~~~~~~~~~~
-LL |     tmp += 1;
-   |         ~~~~
 
 error: Rust has no postfix increment operator
   --> $DIR/increment-notfixed.rs:31:14
@@ -51,8 +45,6 @@ help: use `+= 1` instead
    |
 LL |     while { let tmp_ = tmp; tmp += 1; tmp_ } < 5 {
    |           ++++++++++++    ~~~~~~~~~~~~~~~~~~
-LL |     while tmp += 1 < 5 {
-   |               ~~~~
 
 error: Rust has no postfix increment operator
   --> $DIR/increment-notfixed.rs:39:16
@@ -64,8 +56,6 @@ help: use `+= 1` instead
    |
 LL |     { let tmp = foo.bar.qux; foo.bar.qux += 1; tmp };
    |     +++++++++++            ~~~~~~~~~~~~~~~~~~~~~~~~~
-LL |     foo.bar.qux += 1;
-   |                 ~~~~
 
 error: Rust has no postfix increment operator
   --> $DIR/increment-notfixed.rs:49:10
@@ -77,8 +67,6 @@ help: use `+= 1` instead
    |
 LL |     { let tmp = s.tmp; s.tmp += 1; tmp };
    |     +++++++++++      ~~~~~~~~~~~~~~~~~~~
-LL |     s.tmp += 1;
-   |           ~~~~
 
 error: Rust has no prefix increment operator
   --> $DIR/increment-notfixed.rs:56:5