Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion compiler/rustc_lint/src/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -837,9 +837,17 @@ pub trait LintContext: Sized {
(use_span, "'_".to_owned())
};
debug!(?deletion_span, ?use_span);

// issue 107998 for the case such as a wrong function pointer type
// `deletion_span` is empty and there is no need to report lifetime uses here
let suggestions = if deletion_span.is_empty() {
vec![(use_span, replace_lt)]
} else {
vec![(deletion_span, String::new()), (use_span, replace_lt)]
};
db.multipart_suggestion(
msg,
vec![(deletion_span, String::new()), (use_span, replace_lt)],
suggestions,
Applicability::MachineApplicable,
);
}
Expand Down
9 changes: 9 additions & 0 deletions tests/ui/single-use-lifetime/issue-107998.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#![deny(single_use_lifetimes)]

fn with<R>(f: &fn<'a>(x: &'a i32) -> R) -> R {
//~^ ERROR function pointer types may not have generic parameters
//~| ERROR lifetime parameter `'a` only used once
f(&3)
}

fn main() {}
30 changes: 30 additions & 0 deletions tests/ui/single-use-lifetime/issue-107998.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
error: function pointer types may not have generic parameters
--> $DIR/issue-107998.rs:3:18
|
LL | fn with<R>(f: &fn<'a>(x: &'a i32) -> R) -> R {
| ^^^^
|
help: consider moving the lifetime parameter to a `for` parameter list
|
LL - fn with<R>(f: &fn<'a>(x: &'a i32) -> R) -> R {
LL + fn with<R>(f: &for<'a> fn(x: &'a i32) -> R) -> R {
|

error: lifetime parameter `'a` only used once
--> $DIR/issue-107998.rs:3:19
|
LL | fn with<R>(f: &fn<'a>(x: &'a i32) -> R) -> R {
| ^^ ---
| | |
| | ...is used only here
| | help: elide the single-use lifetime
Copy link
Member

@compiler-errors compiler-errors Feb 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This help: in the middle is still a bit unsatisfying, but oh well

| this lifetime...
|
note: the lint level is defined here
--> $DIR/issue-107998.rs:1:9
|
LL | #![deny(single_use_lifetimes)]
| ^^^^^^^^^^^^^^^^^^^^

error: aborting due to 2 previous errors