rust/compiler/rustc_errors/src, branch 1.79.0https://github.com/rust-lang/rust
http://git.dreamy.place/mirrors/rust/atom?h=1.79.02024-04-27T18:46:07+00:00Rollup merge of #124370 - ShE3py:substitution-part-offset, r=fee1-dead2024-04-27T18:46:07+00:00Matthias Krügermatthias.krueger@famsik.de2024-04-27T18:46:07+00:00urn:sha1:52ce43e9ac31efda1450a10470a4245284cba83e
Fix substitution parts having a shifted underline in some cases
If two suggestions parts are side by side, the underline's offset:
(WIP PR as an example, not yet pushed)
```
error: expected a pattern, found an expression
--> ./main.rs:4:9
|
4 | 1 + 2 => 3
| ^^^^^ arbitrary expressions are not allowed in patterns
|
help: check the value in an arm guard
|
4 | n if n == 1 + 2 => 3
| ~ +++++++++++++
```
The emitter didn't take into account that the string had shrunk/grown if two substitution parts were side-by-side (surprisingly, there was only one case in the ui testsuite.)
```
help: check the value in an arm guard
|
4 | n if n == 1 + 2 => 3
| ~ +++++++++++++
```
``@rustbot`` label +A-suggestion-diagnostics
Format stash message correctly2024-04-25T14:03:17+00:00Michael Gouletmichael@errs.io2024-04-06T02:14:10+00:00urn:sha1:487cdeb039741600f5547d0c619a4cbd4039815dFix substitution parts having a shifted underline in some cases2024-04-25T11:09:13+00:00Lieselotte52315535+she3py@users.noreply.github.com2024-04-25T11:09:13+00:00urn:sha1:b52e4bd99709fdf3c9b709f285d0ab4278fbcf8fRollup merge of #124218 - Xiretza:subsubdiagnostics, r=davidtwco2024-04-23T15:25:17+00:00León Orell Valerian Liehrme@fmease.dev2024-04-23T15:25:17+00:00urn:sha1:6e423e1651e807ee3a07aa2f188fefadcb464071
Allow nesting subdiagnostics in #[derive(Subdiagnostic)]
Stabilize generic `NonZero`.2024-04-22T16:48:47+00:00Markus Reiterme@reitermark.us2024-04-21T16:41:45+00:00urn:sha1:33e68aadc975c60bf975789f70156e67082e8910Move "elided lifetime in path" to subdiagnostic struct2024-04-21T07:45:03+00:00Xiretzaxiretza@xiretza.xyz2024-04-20T13:21:15+00:00urn:sha1:6974e9cf7012b0f3e2a58a8accde23007274f9a9
This requires nested subdiagnostics.
Fix source ordering of IntoDiagArg impls2024-04-21T07:45:03+00:00Xiretzaxiretza@xiretza.xyz2024-04-20T12:57:29+00:00urn:sha1:b220b741c6d4e16e34d183b38d6384d369c9a620Pass translation closure to add_to_diag_with() as reference2024-04-21T07:45:03+00:00Xiretzaxiretza@xiretza.xyz2024-04-18T19:18:35+00:00urn:sha1:5646b65cf58123679fdf4ef489f690d1b21e1436Print note with closure signature on type mismatch2024-04-20T13:48:27+00:00Daniel Sedlakdaniel@sedlak.dev2024-04-02T17:53:13+00:00urn:sha1:be564a8add9b05624274af0d729afdb16674a97dSimplify `static_assert_size`s.2024-04-18T05:36:25+00:00Nicholas Nethercoten.nethercote@gmail.com2024-04-16T07:02:20+00:00urn:sha1:0d97669a171d3d5c9c9c2d3437421d2d35d9bbb5
We want to run them on all 64-bit platforms.