diff options
| -rw-r--r-- | src/librustc/middle/expr_use_visitor.rs | 13 | ||||
| -rw-r--r-- | src/test/compile-fail/borrowck-for-loop-correct-cmt-for-pattern.rs | 33 |
2 files changed, 43 insertions, 3 deletions
diff --git a/src/librustc/middle/expr_use_visitor.rs b/src/librustc/middle/expr_use_visitor.rs index 605811555a1..7c805b1ac4b 100644 --- a/src/librustc/middle/expr_use_visitor.rs +++ b/src/librustc/middle/expr_use_visitor.rs @@ -399,10 +399,16 @@ impl<'d,'t,TYPER:mc::Typer> ExprUseVisitor<'d,'t,TYPER> { ast::ExprForLoop(ref pat, ref head, ref blk, _) => { // The pattern lives as long as the block. debug!("walk_expr for loop case: blk id={}", blk.id); - self.walk_expr(&**head); + self.consume_expr(&**head); - let head_cmt = return_if_err!(self.mc.cat_expr(&**head)); - self.walk_pat(head_cmt, pat.clone()); + // Fetch the type of the value that the iteration yields to + // produce the pattern's categorized mutable type. + let pattern_type = ty::node_id_to_type(self.tcx(), pat.id); + let pat_cmt = self.mc.cat_rvalue(pat.id, + pat.span, + ty::ReScope(blk.id), + pattern_type); + self.walk_pat(pat_cmt, pat.clone()); self.walk_block(&**blk); } @@ -835,6 +841,7 @@ impl<'d,'t,TYPER:mc::Typer> ExprUseVisitor<'d,'t,TYPER> { } ast::PatIdent(ast::BindByValue(_), _, _) => { let mode = copy_or_move(typer.tcx(), cmt_pat.ty, PatBindingMove); + debug!("walk_pat binding consuming pat"); delegate.consume_pat(pat, cmt_pat, mode); } _ => { diff --git a/src/test/compile-fail/borrowck-for-loop-correct-cmt-for-pattern.rs b/src/test/compile-fail/borrowck-for-loop-correct-cmt-for-pattern.rs new file mode 100644 index 00000000000..93a4383b4f5 --- /dev/null +++ b/src/test/compile-fail/borrowck-for-loop-correct-cmt-for-pattern.rs @@ -0,0 +1,33 @@ +// Copyright 2014 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. + +// Issue #16205. + +struct Foo { + a: [Box<int>, ..3], +} + +fn main() { + let mut y = 1i; + let x = Some(&mut y); + for &a in x.iter() { //~ ERROR cannot move out + } + + let f = Foo { + a: [box 3, box 4, box 5], + }; + for &a in f.a.iter() { //~ ERROR cannot move out + } + + let x = Some(box 1i); + for &a in x.iter() { //~ ERROR cannot move out + } +} + |