Skip to content

Commit

Permalink
librustc: Don't allow use after move of implicitly coerced object. Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
luqmana committed Jan 14, 2014
1 parent ab66f76 commit 17f984c
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/librustc/middle/mem_categorization.rs
Expand Up @@ -345,9 +345,12 @@ impl mem_categorization_ctxt {
match **adjustment {
ty::AutoObject(..) => {
// Implicity casts a concrete object to trait object
// Result is an rvalue
// so just patch up the type
let expr_ty = ty::expr_ty_adjusted(self.tcx, expr);
self.cat_rvalue_node(expr, expr_ty)
@cmt_ {
ty: expr_ty,
..*self.cat_expr_unadjusted(expr)
}
}

ty::AutoAddEnv(..) => {
Expand Down
37 changes: 37 additions & 0 deletions src/test/compile-fail/use-after-move-implicity-coerced-object.rs
@@ -0,0 +1,37 @@
// 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.

struct Number {
n: i64
}

impl ToStr for Number {
fn to_str(&self) -> ~str {
self.n.to_str()
}
}

struct List {
list: ~[~ToStr]
}

impl List {
fn push(&mut self, n: ~ToStr) {
self.list.push(n);
}
}

fn main() {
let n = ~Number { n: 42 };
let mut l = ~List { list: ~[] };
l.push(n);
//^~ NOTE: `n` moved here because it has type `~Number`, which is non-copyable (perhaps you meant to use clone()?)
let x = n.to_str(); //~ ERROR: use of moved value: `n`
}

0 comments on commit 17f984c

Please sign in to comment.