Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
fix #105061, Fix unused_parens issue for higher ranked function pointers
  • Loading branch information
chenyukang committed Jan 14, 2023
commit 7d99866bfc43f34dbdd84f4bf982c48a51b70a99
6 changes: 6 additions & 0 deletions compiler/rustc_lint/src/early.rs
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,12 @@ impl<'a, T: EarlyLintPass> ast_visit::Visitor<'a> for EarlyContextAndPass<'a, T>
}

fn visit_where_predicate(&mut self, p: &'a ast::WherePredicate) {
use rustc_ast::{WhereBoundPredicate, WherePredicate};
if let WherePredicate::BoundPredicate(WhereBoundPredicate { bounded_ty, .. }) = p &&
let ast::TyKind::BareFn(b) = &bounded_ty.kind &&
b.generic_params.len() > 0 {
return;
}
ast_visit::walk_where_predicate(self, p);
}

Expand Down
1 change: 0 additions & 1 deletion compiler/rustc_lint/src/unused.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,6 @@ impl EarlyLintPass for UnusedParens {
if let ast::TyKind::Paren(r) = &ty.kind {
match &r.kind {
ast::TyKind::TraitObject(..) => {}
ast::TyKind::BareFn(b) if b.generic_params.len() > 0 => {}
ast::TyKind::ImplTrait(_, bounds) if bounds.len() > 1 => {}
ast::TyKind::Array(_, len) => {
self.check_unused_delims_expr(
Expand Down
17 changes: 17 additions & 0 deletions tests/ui/lint/unused/issue-105061.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#![warn(unused)]
#![deny(warnings)]

struct Inv<'a>(&'a mut &'a ());

trait Trait {}
impl Trait for (for<'a> fn(Inv<'a>),) {}


fn with_bound()
where
((for<'a> fn(Inv<'a>)),): Trait, //~ ERROR unnecessary parentheses around type
{}

fn main() {
with_bound();
}
20 changes: 20 additions & 0 deletions tests/ui/lint/unused/issue-105061.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
error: unnecessary parentheses around type
--> $DIR/issue-105061.rs:12:6
|
LL | ((for<'a> fn(Inv<'a>)),): Trait,
| ^ ^
|
note: the lint level is defined here
--> $DIR/issue-105061.rs:2:9
|
LL | #![deny(warnings)]
| ^^^^^^^^
= note: `#[deny(unused_parens)]` implied by `#[deny(warnings)]`
help: remove these parentheses
|
LL - ((for<'a> fn(Inv<'a>)),): Trait,
LL + (for<'a> fn(Inv<'a>),): Trait,
|

error: aborting due to previous error