Auto merge of #11504 - Alexendoo:type-lints-closures, r=xFrednet
Ignore closures for some type lints Fixes #11417 `hir_ty_to_ty` is used in a couple of the `!is_local` lints, which doesn't play nicely inside bodies changelog: none
This commit is contained in:
commit
2c629cc137
@ -315,7 +315,7 @@ impl<'tcx> LateLintPass<'tcx> for Types {
|
|||||||
fn check_fn(
|
fn check_fn(
|
||||||
&mut self,
|
&mut self,
|
||||||
cx: &LateContext<'_>,
|
cx: &LateContext<'_>,
|
||||||
_: FnKind<'_>,
|
fn_kind: FnKind<'_>,
|
||||||
decl: &FnDecl<'_>,
|
decl: &FnDecl<'_>,
|
||||||
_: &Body<'_>,
|
_: &Body<'_>,
|
||||||
_: Span,
|
_: Span,
|
||||||
@ -340,6 +340,7 @@ impl<'tcx> LateLintPass<'tcx> for Types {
|
|||||||
CheckTyContext {
|
CheckTyContext {
|
||||||
is_in_trait_impl,
|
is_in_trait_impl,
|
||||||
is_exported,
|
is_exported,
|
||||||
|
in_body: matches!(fn_kind, FnKind::Closure),
|
||||||
..CheckTyContext::default()
|
..CheckTyContext::default()
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
@ -427,7 +428,7 @@ impl<'tcx> LateLintPass<'tcx> for Types {
|
|||||||
cx,
|
cx,
|
||||||
ty,
|
ty,
|
||||||
CheckTyContext {
|
CheckTyContext {
|
||||||
is_local: true,
|
in_body: true,
|
||||||
..CheckTyContext::default()
|
..CheckTyContext::default()
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
@ -481,7 +482,7 @@ impl Types {
|
|||||||
}
|
}
|
||||||
|
|
||||||
match hir_ty.kind {
|
match hir_ty.kind {
|
||||||
TyKind::Path(ref qpath) if !context.is_local => {
|
TyKind::Path(ref qpath) if !context.in_body => {
|
||||||
let hir_id = hir_ty.hir_id;
|
let hir_id = hir_ty.hir_id;
|
||||||
let res = cx.qpath_res(qpath, hir_id);
|
let res = cx.qpath_res(qpath, hir_id);
|
||||||
if let Some(def_id) = res.opt_def_id() {
|
if let Some(def_id) = res.opt_def_id() {
|
||||||
@ -581,8 +582,8 @@ impl Types {
|
|||||||
#[derive(Clone, Copy, Default)]
|
#[derive(Clone, Copy, Default)]
|
||||||
struct CheckTyContext {
|
struct CheckTyContext {
|
||||||
is_in_trait_impl: bool,
|
is_in_trait_impl: bool,
|
||||||
/// `true` for types on local variables.
|
/// `true` for types on local variables and in closure signatures.
|
||||||
is_local: bool,
|
in_body: bool,
|
||||||
/// `true` for types that are part of the public API.
|
/// `true` for types that are part of the public API.
|
||||||
is_exported: bool,
|
is_exported: bool,
|
||||||
is_nested_call: bool,
|
is_nested_call: bool,
|
||||||
|
@ -159,4 +159,9 @@ mod box_fat_ptr {
|
|||||||
//~| NOTE: `Box<Box<DynSized>>` is already on the heap, `Rc<Box<Box<DynSized>>>` makes
|
//~| NOTE: `Box<Box<DynSized>>` is already on the heap, `Rc<Box<Box<DynSized>>>` makes
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// https://github.com/rust-lang/rust-clippy/issues/11417
|
||||||
|
fn type_in_closure() {
|
||||||
|
let _ = |_: &mut Box<Box<dyn ToString>>| {};
|
||||||
|
}
|
||||||
|
|
||||||
fn main() {}
|
fn main() {}
|
||||||
|
@ -49,4 +49,9 @@ mod inner_mod {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// https://github.com/rust-lang/rust-clippy/issues/11417
|
||||||
|
fn in_closure() {
|
||||||
|
let _ = |_: Vec<Box<dyn ToString>>| {};
|
||||||
|
}
|
||||||
|
|
||||||
fn main() {}
|
fn main() {}
|
||||||
|
@ -49,4 +49,9 @@ mod inner_mod {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// https://github.com/rust-lang/rust-clippy/issues/11417
|
||||||
|
fn in_closure() {
|
||||||
|
let _ = |_: Vec<Box<dyn ToString>>| {};
|
||||||
|
}
|
||||||
|
|
||||||
fn main() {}
|
fn main() {}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user