test: Subtract code_offset from width for ui_testing

[Muscraft]

annotate-snippets does not have a "UI test" mode like rustc, where the code offset is not subtracted from the column width. This makes it so annotate-snippets will shift the output for some very long tests 5 - 7 columns to the left. As part of my work to have rustc use annotate-snippets, and to reduce the test differences between the two, I figured it would be best if rustc started subtracting the code offset from the width as well.

The first commit exists to keep the test output changes of adding a new line to a test separate from adding the --diagnostic-width flag in the second commit. This makes it easier to verify that adding the flag does not affect the test's output.

Zulip discussion

[rustbot]

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

[rustbot]

r? @nnethercote

rustbot has assigned @nnethercote.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

[RalfJung]

From a test suite maintenance perspective this looks not great -- how does one know whether one has to add a random --diagnostic-width=145 to a Miri test? What happens if I don't add that?

[Muscraft]

Personally, I would only add --diagnostic-width to tests that explicitly test how width affects the output. I only added --diagnostic-width to the tests in this PR to keep them the same as before. Without --diagnostic-width the miri tests would look:

error: Undefined Behavior: `simd_cast` intrinsic called on 3.40282347E+38f32 which cannot be represented in target type `i32`
  --> tests/fail/intrinsics/simd-float-to-int.rs:LL:CC
   |
LL | ...   let _x: i32x2 = f32x2::from_array([f32::MAX, f32::MIN]).to_int_unchecked();
   |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Undefined Behavior occurred here
   |
   = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
   = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
   = note: BACKTRACE:
   = note: inside `main` at tests/fail/intrinsics/simd-float-to-int.rs:LL:CC

error: Undefined Behavior: accessing memory with alignment ALIGN, but alignment ALIGN is required
  --> tests/fail/intrinsics/copy_unaligned.rs:LL:CC
   |
LL | ...   std::intrinsics::copy_nonoverlapping(&data[5], ptr, 0);
   |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Undefined Behavior occurred here
   |
   = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
   = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
   = note: BACKTRACE:
   = note: inside `main` at tests/fail/intrinsics/copy_unaligned.rs:LL:CC

Branch with miri output changes

[RalfJung]

Without commenting on whether we want to have those output changes or not -- if the output does change like that, I'd much rather just have the stderr files updated in Miri than add random compiler flags.

[nnethercote]

Thanks for splitting this out into a separate commit!

[nnethercote]

I'm going to pass this on to David, who already had intelligent things to say in the Zulip thread.

r? davidtwco

[Muscraft]

I updated the PR so that the --diagnostic-width flag is only being added to tests in tests/ui/diagnostic-width.

[rustbot]

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

[davidtwco]

This seems sensible to me, this has very little impact on the diagnostic output, and means that we'll be closer to matching annotate-snippets' output when we switch over to that.

[davidtwco]

@bors r+

[bors]

📌 Commit 9c6897b has been approved by davidtwco

It is now in the queue for this repository.