Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-23 21:23:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update test, fix lint

Browse source
This commit is contained in:
Manish Goregaokar 2017-08-30 10:07:25 -07:00 committed by Laura Peskin
parent 27d5ff6c9c
commit d0eff10a7c
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
clippy_lints/src/loops.rs
View file

@ -1329,8 +1329,8 @@ impl<'a, 'tcx> Delegate<'tcx> for MutateDelegate<'a, 'tcx> {
fn borrow(&mut self, _: NodeId, _: Span, _: cmt<'tcx>, _: ty::Region, _: ty::BorrowKind, _: LoanCause) {
}
fn mutate(&mut self, assignment_id: NodeId, _: Span, _: cmt<'tcx>, _: MutateMode) {
println!("something was mutated"); // tmp: see if this function is ever called at all (no)
fn mutate(&mut self, assignment_id: NodeId, sp: Span, _: cmt<'tcx>, _: MutateMode) {
self.cx.sess().span_note_without_error(sp, "mutates!");
if assignment_id == self.node_id {
self.was_mutated = true;
}
@ -1364,18 +1364,19 @@ fn check_for_mutation(cx: &LateContext, body: &Expr, bound: &Expr) -> bool {
let QPath::Resolved(None, ref path) = *qpath,
], {
let def = cx.tables.qpath_def(qpath, bound.hir_id);
cx.sess().span_note_without_error(body.span, "loop");
match def {
Def::Local(..) | Def::Upvar(..) => {
let def_id = def.def_id();
let node_id = cx.tcx.hir.as_local_node_id(def_id).expect("local/upvar are local nodes");
let node_str = cx.tcx.hir.get(node_id);
if_let_chain! {[ // prob redundant now, remove
let map::Node::NodeLocal(local) = node_str,
let PatKind::Binding(bind_ann, _, _, _) = local.pat.node,
if_let_chain! {[
let map::Node::NodeBinding(pat) = node_str,
let PatKind::Binding(bind_ann, _, _, _) = pat.node,
let BindingAnnotation::Mutable = bind_ann,
], {
println!("bound was mutable"); // tmp: make sure the full if-let chain executes when it should (yes)
let mut delegate = MutateDelegate { cx: cx, node_id: node_id, was_mutated: false };
let region_maps = &cx.tcx.region_maps(def_id); // is this the correct argument?
ExprUseVisitor::new(&mut delegate, cx.tcx, cx.param_env, region_maps, cx.tables).walk_expr(body);

7
tests/run-pass/mut_range_bound_tmp.rs
View file

@ -1,6 +1,8 @@
#![feature(plugin)]
#![plugin(clippy)]
#![allow(unused)]
fn main() {
mut_range_bound_upper();
mut_range_bound_lower();
@ -10,7 +12,10 @@ fn main() {
fn mut_range_bound_upper() {
let mut m = 4;
for i in 0..m { continue; } // WARNING the range upper bound is mutable
for i in 0..m {
m = 5;
continue; } // WARNING the range upper bound is mutable
}
fn mut_range_bound_lower() {