auto merge of #6385 : huonw/rust/rustc-dtor-struct-match, r=nikomatsakis

**Caveat**: With the current commit, this check only works for `match`s, the checks (incorrectly) do not run for patterns in `let`s, and invalid/unsafe code compiles.

I don't know how to fix this, I experimented with some things to try to make let patterns and match patterns run on the same code (since this would presumably fix many of the other unsoundness issues of let-patterns, e.g. #6225), but I don't understand enough of the code. (I think I heard someone talking about a fix for `let` being in progress?)

Fixes #6344 and #6341.
This commit is contained in:
bors 2013-05-11 11:49:50 -07:00
commit e478cedb0a
7 changed files with 132 additions and 23 deletions

View file

@ -1,3 +1,4 @@
// xfail-test #3024
// 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.
@ -19,7 +20,7 @@ impl Drop for X {
}
fn unwrap(x: X) -> ~str {
let X { x: y } = x; //~ ERROR deconstructing struct not allowed in pattern
let X { x: y } = x; //~ ERROR cannot bind by-move within struct
y
}

View file

@ -0,0 +1,28 @@
// Copyright 2013 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 X {
x: ~str,
}
impl Drop for X {
fn finalize(&self) {
error!("value: %s", self.x);
}
}
fn main() {
let x = X { x: ~"hello" };
match x {
X { x: y } => error!("contents: %s", y)
//~^ ERROR cannot bind by-move within struct
}
}

View file

@ -0,0 +1,18 @@
// Copyright 2013 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.
#[deriving(Eq)]
struct A { x: uint }
impl Drop for A {
fn finalize(&self) {}
}
fn main() {}

View file

@ -0,0 +1,22 @@
// xfail-test #3874
// Copyright 2013 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 A { x: uint }
impl Drop for A {
fn finalize(&self) {}
}
fn main() {
let a = A { x: 0 };
let A { x: ref x } = a;
debug!("%?", x)
}

View file

@ -0,0 +1,24 @@
// Copyright 2013 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 A { x: uint }
impl Drop for A {
fn finalize(&self) {}
}
fn main() {
let a = A { x: 0 };
match a {
A { x : ref x } => {
debug!("%?", x)
}
}
}