0682ad0eb9
Changes: - Refactor move mode computation - Removes move mode arguments, unary move, capture clauses (though they still parse for backwards compatibility) - Simplify how moves are handled in trans - Fix a number of illegal copies that cropped up - Workaround for bug involving def-ids in params (see details below) Future work (I'll open bugs for these...): - Improve error messages for moves that are due to bindings - Add support for moving owned content like a.b.c to borrow check, test in trans (but I think it'll "just work") - Proper fix for def-ids in params Def ids in params: Move captures into a map instead of recomputing. This is a workaround for a larger bug having to do with the def-ids associated with ty_params, which are not always properly preserved when inlining. I am not sure of my preferred fix for the larger bug yet. This current fix removes the only code in trans that I know of which relies on ty_param def-ids, but feels fragile.
49 lines
1.2 KiB
Rust
49 lines
1.2 KiB
Rust
// 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.
|
|
|
|
fn user(_i: int) {}
|
|
|
|
fn foo() {
|
|
// Here, i is *moved* into the closure: Not actually OK
|
|
let mut i = 0;
|
|
do task::spawn {
|
|
user(i); //~ ERROR mutable variables cannot be implicitly captured
|
|
}
|
|
}
|
|
|
|
fn bar() {
|
|
// Here, i would be implicitly *copied* but it
|
|
// is mutable: bad
|
|
let mut i = 0;
|
|
while i < 10 {
|
|
do task::spawn {
|
|
user(i); //~ ERROR mutable variables cannot be implicitly captured
|
|
}
|
|
i += 1;
|
|
}
|
|
}
|
|
|
|
fn car() {
|
|
// Here, i is mutable, but *explicitly* shadowed copied:
|
|
let mut i = 0;
|
|
while i < 10 {
|
|
{
|
|
let i = i;
|
|
do task::spawn {
|
|
user(i);
|
|
}
|
|
}
|
|
i += 1;
|
|
}
|
|
}
|
|
|
|
fn main() {
|
|
}
|