Skip to content

fix: Only special case single line item attribute suggestions #148004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −3
Open

fix: Only special case single line item attribute suggestions #148004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions compiler/rustc_errors/src/emitter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2152,6 +2152,7 @@ impl HumanEmitter {

let line_start = sm.lookup_char_pos(parts[0].original_span.lo()).line;
let mut lines = complete.lines();
let lines_len = lines.clone().count();
if lines.clone().next().is_none() {
// Account for a suggestion to completely remove a line(s) with whitespace (#94192).
let line_end = sm.lookup_char_pos(parts[0].original_span.hi()).line;
Expand Down Expand Up @@ -2192,6 +2193,7 @@ impl HumanEmitter {
if highlight_parts.len() == 1
&& line.trim().starts_with("#[")
&& line.trim().ends_with(']')
&& lines_len == 1
{
is_item_attribute = true;
}
Expand Down
3 changes: 0 additions & 3 deletions src/tools/clippy/tests/ui/new_without_default.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ LL + fn default() -> Self {
LL + Self::new()
LL + }
LL + }
LL | impl NewWithCfg {
|

error: you should consider adding a `Default` implementation for `NewWith2Cfgs`
Expand All @@ -212,7 +211,6 @@ LL + fn default() -> Self {
LL + Self::new()
LL + }
LL + }
LL | impl NewWith2Cfgs {
|

error: you should consider adding a `Default` implementation for `NewWithExtraneous`
Expand Down Expand Up @@ -250,7 +248,6 @@ LL + fn default() -> Self {
LL + Self::new()
LL + }
LL + }
LL | impl NewWithCfgAndExtraneous {
|

error: aborting due to 13 previous errors
Expand Down
Loading