bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Don't lint explicit_auto_deref when the initial type is neither a reference, nor a receiver

Browse source
This commit is contained in:
Jason Newcomb 2022-11-30 11:15:49 -05:00
parent 78589ffad2
commit 2d32b40359
3 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
clippy_lints/src/dereference.rs
View file

@ -289,23 +289,24 @@ impl<'tcx> LateLintPass<'tcx> for Dereferencing<'tcx> {
let (position, adjustments) = walk_parents(cx, &mut self.possible_borrowers, expr, &self.msrv); let (position, adjustments) = walk_parents(cx, &mut self.possible_borrowers, expr, &self.msrv);
match kind { match kind {
RefOp::Deref => { RefOp::Deref => {
let sub_ty = typeck.expr_ty(sub_expr);
if let Position::FieldAccess { if let Position::FieldAccess {
name, name,
of_union: false, of_union: false,
} = position } = position
&& !ty_contains_field(typeck.expr_ty(sub_expr), name) && !ty_contains_field(sub_ty, name)
{ {
self.state = Some(( self.state = Some((
State::ExplicitDerefField { name }, State::ExplicitDerefField { name },
StateData { span: expr.span, hir_id: expr.hir_id, position }, StateData { span: expr.span, hir_id: expr.hir_id, position },
)); ));
} else if position.is_deref_stable() { } else if position.is_deref_stable() && sub_ty.is_ref() {
self.state = Some(( self.state = Some((
State::ExplicitDeref { mutability: None }, State::ExplicitDeref { mutability: None },
StateData { span: expr.span, hir_id: expr.hir_id, position }, StateData { span: expr.span, hir_id: expr.hir_id, position },
)); ));
} }
} },
RefOp::Method(target_mut) RefOp::Method(target_mut)
if !is_lint_allowed(cx, EXPLICIT_DEREF_METHODS, expr.hir_id) if !is_lint_allowed(cx, EXPLICIT_DEREF_METHODS, expr.hir_id)
&& position.lint_explicit_deref() => && position.lint_explicit_deref() =>
@ -320,7 +321,7 @@ impl<'tcx> LateLintPass<'tcx> for Dereferencing<'tcx> {
StateData { StateData {
span: expr.span, span: expr.span,
hir_id: expr.hir_id, hir_id: expr.hir_id,
position position,
}, },
)); ));
}, },
@ -394,7 +395,11 @@ impl<'tcx> LateLintPass<'tcx> for Dereferencing<'tcx> {
msg, msg,
snip_expr, snip_expr,
}), }),
StateData { span: expr.span, hir_id: expr.hir_id, position }, StateData {
span: expr.span,
hir_id: expr.hir_id,
position,
},
)); ));
} else if position.is_deref_stable() } else if position.is_deref_stable()
// Auto-deref doesn't combine with other adjustments // Auto-deref doesn't combine with other adjustments
@ -406,7 +411,7 @@ impl<'tcx> LateLintPass<'tcx> for Dereferencing<'tcx> {
StateData { StateData {
span: expr.span, span: expr.span,
hir_id: expr.hir_id, hir_id: expr.hir_id,
position position,
}, },
)); ));
} }

4
tests/ui/explicit_auto_deref.fixed
View file

@ -277,4 +277,8 @@ fn main() {
unimplemented!() unimplemented!()
} }
let _: String = takes_assoc(&*String::new()); let _: String = takes_assoc(&*String::new());
// Issue #9901
fn takes_ref(_: &i32) {}
takes_ref(*Box::new(&0i32));
} }

4
tests/ui/explicit_auto_deref.rs
View file

@ -277,4 +277,8 @@ fn main() {
unimplemented!() unimplemented!()
} }
let _: String = takes_assoc(&*String::new()); let _: String = takes_assoc(&*String::new());
// Issue #9901
fn takes_ref(_: &i32) {}
takes_ref(*Box::new(&0i32));
} }