Skip to content

Commit

Permalink
Auto merge of #50409 - KiChjang:issue-50343, r=nikomatsakis
Browse files Browse the repository at this point in the history
Skip checking for unused mutable locals that have no name

Fixes #50343.
  • Loading branch information
bors committed May 4, 2018
2 parents e78c51a + 4bc4848 commit 22a41e4
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/librustc_mir/borrow_check/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,10 @@ fn do_mir_borrowck<'a, 'gcx, 'tcx>(
continue;
}

// Skip over locals that begin with an underscore
// Skip over locals that begin with an underscore or have no name
match local_decl.name {
Some(name) if name.as_str().starts_with("_") => continue,
_ => {},
Some(name) => if name.as_str().starts_with("_") { continue; },
None => continue,
}

let source_info = local_decl.source_info;
Expand Down
17 changes: 17 additions & 0 deletions src/test/compile-fail/nll/unused-mut-issue-50343.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(nll)]
#![deny(unused_mut)]

fn main() {
vec![(42, 22)].iter().map(|(mut x, _y)| ()).count();
//~^ ERROR: variable does not need to be mutable
}
17 changes: 17 additions & 0 deletions src/test/run-pass/nll/issue-50343.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(nll)]
#![deny(unused_mut)]

fn main() {
vec![42].iter().map(|_| ()).count();
vec![(42, 22)].iter().map(|(_x, _y)| ()).count();
}

0 comments on commit 22a41e4

Please sign in to comment.