don't lint on x = x + y inside an AddAssign impl

fixes #1302
This commit is contained in:
Oliver Schneider 2016-12-19 11:13:07 +01:00
parent ea0227fff7
commit 5aded99033
No known key found for this signature in database
GPG key ID: 56D6EEA0FC67AC46
2 changed files with 35 additions and 0 deletions

View file

@ -1,5 +1,6 @@
use rustc::hir;
use rustc::lint::*;
use syntax::ast;
use utils::{span_lint_and_then, snippet_opt, SpanlessEq, get_trait_def_id, implements_trait};
use utils::{higher, sugg};
@ -135,6 +136,19 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for AssignOps {
} else {
return; // useless if the trait doesn't exist
};
// check that we are not inside an `impl AssignOp` of this exact operation
let parent_fn = cx.tcx.map.get_parent(e.id);
let parent_impl = cx.tcx.map.get_parent(parent_fn);
// the crate node is the only one that is not in the map
if parent_impl != ast::CRATE_NODE_ID {
if let hir::map::Node::NodeItem(item) = cx.tcx.map.get(parent_impl) {
if let hir::Item_::ItemImpl(_, _, _, Some(ref trait_ref), _, _) = item.node {
if trait_ref.path.def.def_id() == trait_id {
return;
}
}
}
}
implements_trait($cx, $ty, trait_id, vec![$rty])
},)*
_ => false,

View file

@ -34,3 +34,24 @@ fn main() {
a %= 42 % a;
a <<= 6 << a;
}
// check that we don't lint on op assign impls, because that's just the way to impl them
use std::ops::{Mul, MulAssign};
#[derive(Copy, Clone, Debug, PartialEq)]
pub struct Wrap(i64);
impl Mul<i64> for Wrap {
type Output = Self;
fn mul(self, rhs: i64) -> Self {
Wrap(self.0 * rhs)
}
}
impl MulAssign<i64> for Wrap {
fn mul_assign(&mut self, rhs: i64) {
*self = *self * rhs
}
}