rust/compiler/rustc_errors/src, branch 1.63.0https://github.com/rust-lang/rust
http://git.dreamy.place/mirrors/rust/atom?h=1.63.02022-06-17T17:30:16+00:00Auto merge of #97892 - klensy:fix-spaces, r=oli-obk2022-06-17T17:30:16+00:00borsbors@rust-lang.org2022-06-17T17:30:16+00:00urn:sha1:0cb9899e780bcefb9008088c1e6d6cd5fe2593b4
diagnostics: remove trailing spaces
Remove few occurrences of trailing spaces and drive by fix of needless alloc of const string.
Rollup merge of #97798 - WaffleLapkin:allow_for_suggestions_that_are_quite_far_away_from_each_other, r=estebank2022-06-17T10:21:48+00:00Dylan DPC99973273+Dylan-DPC@users.noreply.github.com2022-06-17T10:21:48+00:00urn:sha1:74aa55b3fcae638ce3df9111ef7822474f9a2b61
Hide irrelevant lines in suggestions to allow for suggestions that are far from each other to be shown
This is an attempt to fix suggestions one part of which is 6 lines or more far from the first. I've noticed "the problem" (of not showing some parts of the suggestion) here: https://github.com/rust-lang/rust/pull/97759#discussion_r889689230.
I'm not sure about the implementation (this big closure is just bad and makes already complicated code even more so), but I want to at least discuss the result.
Here is an example of how this changes the output:
Before:
```text
help: consider enclosing expression in a block
|
3 ~ 'l: { match () { () => break 'l,
4 |
5 |
6 |
7 |
8 |
...
```
After:
```text
help: consider enclosing expression in a block
|
3 ~ 'l: { match () { () => break 'l,
4 |
...
31|
32~ } };
|
```
r? `@estebank`
`@rustbot` label +A-diagnostics +A-suggestion-diagnostics
Add back MAX_SUGGESTION_HIGHLIGHT_LINES so clippy is happy & buildable2022-06-16T13:08:26+00:00Maybe Wafflewaffle.lapkin@gmail.com2022-06-13T14:28:31+00:00urn:sha1:3c55672795bdc4473bbaa1922c1703916839c4aaTry to clean up code...2022-06-16T13:08:26+00:00Maybe Wafflewaffle.lapkin@gmail.com2022-06-13T11:22:26+00:00urn:sha1:cf6f821c3372b5ddc3cb0a92afcc48a1e0313efa
I'm not sure if I succeeded
Improve suggestions when its parts are far from each other2022-06-16T13:08:26+00:00Maybe Wafflewaffle.lapkin@gmail.com2022-06-06T14:04:42+00:00urn:sha1:87fded1eddf834f2decbfd05e6fda35cb1ee4747
Previously we only show at most 6 lines of suggestions and, if the
suggestions are more than 6 lines apart, we've just showed ... at the
end. This is probably fine, but quite confusing in my opinion.
This commit is an attempt to show ... in places where there is nothing
to suggest instead, for example:
Before:
```text
help: consider enclosing expression in a block
|
3 ~ 'l: { match () { () => break 'l,
4 |
5 |
6 |
7 |
8 |
...
```
After:
```text
help: consider enclosing expression in a block
|
3 ~ 'l: { match () { () => break 'l,
4 |
...
31|
32~ } };
|
```
Fix a typo2022-06-16T13:08:26+00:00Maybe Wafflewaffle.lapkin@gmail.com2022-06-06T13:42:53+00:00urn:sha1:260c5fd58778f14c4f4d19e1b91784a4e0a675e3
!(a & b) = !a | !b
drive by fix needless allocation of const string number2022-06-16T11:40:30+00:00klensyklensy@users.noreply.github.com2022-06-08T18:23:39+00:00urn:sha1:68ea8ff16f74be00797a237f8fd438b1d097ab5a fix one more case of trailing space2022-06-16T11:40:29+00:00klensyklensy@users.noreply.github.com2022-06-08T18:07:59+00:00urn:sha1:989d1a732f194d852e9a3636fc283c65612f995fdiagnostics: fix trailing space2022-06-16T11:40:28+00:00klensyklensy@users.noreply.github.com2022-06-08T17:34:57+00:00urn:sha1:0ff8ae3111939a30d61f158b53e120f965989520Rollup merge of #97757 - xFrednet:rfc-2383-expect-with-force-warn, r=wesleywiser,flip19952022-06-16T07:10:20+00:00Matthias Krügermatthias.krueger@famsik.de2022-06-16T07:10:20+00:00urn:sha1:95be954af412e4473499a3745c84583c545f15e5
Support lint expectations for `--force-warn` lints (RFC 2383)
Rustc has a `--force-warn` flag, which overrides lint level attributes and forces the diagnostics to always be warn. This means, that for lint expectations, the diagnostic can't be suppressed as usual. This also means that the expectation would not be fulfilled, even if a lint had been triggered in the expected scope.
This PR now also tracks the expectation ID in the `ForceWarn` level. I've also made some minor adjustments, to possibly catch more bugs and make the whole implementation more robust.
This will probably conflict with https://github.com/rust-lang/rust/pull/97718. That PR should ideally be reviewed and merged first. The conflict itself will be trivial to fix.
---
r? `@wesleywiser`
cc: `@flip1995` since you've helped with the initial review and also discussed this topic with me. :upside_down_face:
Follow-up of: https://github.com/rust-lang/rust/pull/87835
Issue: https://github.com/rust-lang/rust/issues/85549
Yeah, and that's it.