Tweak output for 'add line' suggestion

[estebank]

Closes #108174

[rustbot]

r? @compiler-errors

(rustbot has picked a reviewer for you, use r? to override)

[rustbot]

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

[estebank]

For the "add context line" part of this PR, we could alternatively peek at the suggestion and see if it starts with #[ and only provide context then.

[bors]

☔ The latest upstream changes (presumably #109884) made this pull request unmergeable. Please resolve the merge conflicts.

[compiler-errors]

Perhaps we can do something like... checking that the span of the suggestion isn't DUMMY_SP (to avoid those use suggestions) or that the suggestion starts with #[derive...? Thoughts?

[estebank]

We already check for DUMMY_SP (I'm not seeing any incorrect use item). I considered specializing the #[derive check and would require a bit of a refactor, but that could potentially be made to work. Do you feel this later check is a pre-condition to merge this PR? I can do it, just will take me a bit to do so.

[compiler-errors]

Maybe we should suppress this behavior if the suggestion ends in two newlines \n\n, and then the suggestions like "add this impl" or "add this use" where we want to skip rendering the next line should be made two have two trailing newlines. That would also probably make their rustfix behavior a bit better, since they would render like:

use ...;

struct Foo;

instead of:

use ...;
struct Foo;

[estebank]

I did a quick check for starts with #[ and ends with ]\n (newline is implicit in the code, you won't see it explicitly in the pattern) and only emit the following line for those.

[bors]

☔ The latest upstream changes (presumably #110214) made this pull request unmergeable. Please resolve the merge conflicts.

[compiler-errors]

r=me after rebase

@rustbot author

[estebank]

@bors r=compiler-errors

[bors]

📌 Commit 9fadcc1 has been approved by compiler-errors

It is now in the queue for this repository.

[bors]

⌛ Testing commit 9fadcc1 with merge d37e2f7...

[bors]

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing d37e2f7 to master...

[rust-timer]

Finished benchmarking commit (d37e2f7): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.5%	[0.5%, 0.6%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.8%	[-2.8%, -2.8%]	1
All ❌✅ (primary)	0.5%	[0.5%, 0.6%]	2

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.8%	[0.8%, 0.8%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.4%	[-0.4%, -0.4%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.2%	[-0.4%, 0.8%]	2