auto merge of #8932 : huonw/rust/closed-issues, r=thestinger

Author: bors

src/test/compile-fail/arc-cant-nest-rw-arc-3177.rs

@@ -8,12 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
-// error-pattern: instantiating a type parameter with an incompatible type
 extern mod extra;
-use extra::arc::rw_arc;
+use extra::arc::RWArc;
 
 fn main() {
-    let arc1  = ~rw_arc(true);
-    let _arc2 = ~rw_arc(arc1);
+    let arc1  = RWArc::new(true);
+    let _arc2 = RWArc::new(arc1); //~ ERROR instantiating a type parameter with an incompatible type
 }

src/test/compile-fail/bind-by-move-no-lvalues-2.rs

@@ -1,4 +1,3 @@
-// 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.
@@ -20,7 +19,7 @@ impl Drop for X {
 }
 
 fn unwrap(x: X) -> ~str {
-    let X { x: y } = x; //~ ERROR cannot bind by-move within struct
+    let X { x: y } = x; //~ ERROR cannot move out of type
     y
 }
 

src/test/compile-fail/disallowed-deconstructing-destructing-struct-let.rs

@@ -8,20 +8,19 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
+// issue 7327
 
-struct X { x: (), }
+// xfail-fast #7103
+extern mod extra;
+use extra::arc::*;
 
-impl Drop for X {
-    fn drop(&self) {
-        error!("destructor runs");
-    }
-}
+struct A { y: Arc<int>, x: Arc<int> }
 
+impl Drop for A {
+    fn drop(&self) { println(fmt!("x=%?", self.x.get())); }
+}
 fn main() {
-    let x = Some(X { x: () });
-    match x {
-        Some(_z) => { }, //~ ERROR cannot bind by-move when matching an lvalue
-        None => fail!()
-    }
+    let a = A { y: Arc::new(1), x: Arc::new(2) };
+    let _b = A { y: Arc::new(3), ..a };
+    let _c = a; //~ ERROR use of moved value
 }

src/test/compile-fail/bind-by-move-no-lvalues-1.rs renamed to src/test/compile-fail/functional-struct-update-noncopyable.rs

@@ -8,10 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
 fn foo<T, U>(x: T, y: U) {
     let mut xx = x;
-    xx = y; // error message should mention T and U, not 'a and 'b
+    xx = y; //~ ERROR expected `T` but found `U`
 }
 
 fn main() {

src/test/compile-fail/issue-2951.rs

@@ -8,12 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
 struct x(());
 impl x {
-    pub unsafe fn with() { } // This should fail
+    pub unsafe fn with(&self) { }
 }
 
 fn main() {
-    x(()).with();
+    x(()).with(); //~ ERROR requires unsafe function or block
 }

src/test/compile-fail/issue-3080.rs

@@ -9,6 +9,8 @@
 // except according to those terms.
 
 // xfail-test
+use std::io;
+
 struct Point {
     x: float,
     y: float,

src/test/compile-fail/issue-3973.rs

@@ -8,5 +8,4 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
-fn main() { fmt!("%?", None); } //~ ERROR can't resolve type variable
+fn main() { fmt!("%?", None); } //~ ERROR unconstrained type

src/test/compile-fail/issue-5062.rs

@@ -1,7 +1,5 @@
-//xfail-test
-
 // Trying to create a fixed-length vector with a negative size
 
 fn main() {
-      let _x = [0,..-1];
+      let _x = [0,..-1]; //~ ERROR found negative integer
 }

src/test/compile-fail/issue-6977.rs

@@ -15,7 +15,7 @@ extern mod extra;
 fn f() {
 }
 
-use extra::net;    //~ ERROR view items must be declared at the top
+use extra::net;    //~ ERROR `use` and `extern mod` declarations must precede items
 
 fn main() {
 }