From 163780ee0b41de143ec06181026ef575a736de2f Mon Sep 17 00:00:00 2001 From: Joel Gallant Date: Thu, 4 Oct 2018 17:30:45 -0600 Subject: [PATCH] Solves #3222 by checking the BareFnTy Abi type --- clippy_lints/src/types.rs | 3 ++- tests/ui/complex_types.rs | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/clippy_lints/src/types.rs b/clippy_lints/src/types.rs index 857238e90..6f024e596 100644 --- a/clippy_lints/src/types.rs +++ b/clippy_lints/src/types.rs @@ -16,6 +16,7 @@ use std::borrow::Cow; use crate::syntax::ast::{FloatTy, IntTy, UintTy}; use crate::syntax::source_map::Span; use crate::syntax::errors::DiagnosticBuilder; +use crate::rustc_target::spec::abi::Abi; use crate::utils::{comparisons, differing_macro_contexts, higher, in_constant, in_macro, last_path_segment, match_def_path, match_path, match_type, multispan_sugg, opt_def_id, same_tys, snippet, snippet_opt, span_help_and_lint, span_lint, span_lint_and_sugg, span_lint_and_then, clip, unsext, sext, int_bits}; @@ -1224,7 +1225,7 @@ impl<'tcx> Visitor<'tcx> for TypeComplexityVisitor { TyKind::Path(..) | TyKind::Slice(..) | TyKind::Tup(..) | TyKind::Array(..) => (10 * self.nest, 1), // function types bring a lot of overhead - TyKind::BareFn(..) => (50 * self.nest, 1), + TyKind::BareFn(ref bare) if bare.abi == Abi::Rust => (50 * self.nest, 1), TyKind::TraitObject(ref param_bounds, _) => { let has_lifetime_parameters = param_bounds diff --git a/tests/ui/complex_types.rs b/tests/ui/complex_types.rs index a6875793c..eac2c07c1 100644 --- a/tests/ui/complex_types.rs +++ b/tests/ui/complex_types.rs @@ -40,5 +40,22 @@ fn test3() { let _y: Vec>> = vec![]; } +#[repr(C)] +struct D { + // should not warn, since we don't have control over the signature (#3222) + test4: extern "C" fn( + itself: &D, + a: usize, + b: usize, + c: usize, + d: usize, + e: usize, + f: usize, + g: usize, + h: usize, + i: usize, + ), +} + fn main() { }