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() {
 }

src/test/compile-fail/view-items-at-top.rs

@@ -1,4 +1,3 @@
-// xfail-test #5321
 // 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.

src/test/run-pass/autoderef-method-priority.rs

@@ -1,5 +1,3 @@
-// xfail-test #5530
-
 // 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.
@@ -18,18 +16,18 @@ enum ES<T> {
 
 
 pub fn main() {
-    let es11 = ES1 {x: 1}, es12 = ES1 {x: 2}, es21 = ES2 {x: 1, y: 1}, es22 = ES2 {x: 1, y: 2};
+    let (es11, es12, es21, es22) = (ES1 {x: 1}, ES1 {x: 2}, ES2 {x: 1, y: 1}, ES2 {x: 1, y: 2});
 
     // in order for both Ord and TotalOrd
     let ess = [es11, es12, es21, es22];
 
-    for ess.eachi |i, es1| {
-        for ess.eachi |j, es2| {
+    for (i, es1) in ess.iter().enumerate() {
+        for (j, es2) in ess.iter().enumerate() {
             let ord = i.cmp(&j);
 
             let eq = i == j;
-            let lt = i < j, le = i <= j;
-            let gt = i > j, ge = i >= j;
+            let (lt, le) = (i < j, i <= j);
+            let (gt, ge) = (i > j, i >= j);
 
             // Eq
             assert_eq!(*es1 == *es2, eq);
@@ -49,4 +47,4 @@ pub fn main() {
             assert_eq!(es1.cmp(es2), ord);
         }
     }
-}
+}

src/test/run-pass/deriving-cmp-generic-struct-enum.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
 pub fn main() {
-    let x : @str = @"hello";
+    let _x : @str = @"hello";
 }

src/test/run-pass/estr-shared.rs

@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test #5744 fails on 32 bit
+
 // Test a foreign function that accepts and returns a struct
 // by value.
 
-// xfail-test #5744
-
 #[deriving(Eq)]
 struct TwoU16s {
     one: u16, two: u16
@@ -22,6 +22,7 @@ extern {
     pub fn rust_dbg_extern_identity_TwoU16s(v: TwoU16s) -> TwoU16s;
 }
 
+#[fixed_stack_segment] #[inline(never)]
 pub fn main() {
     unsafe {
         let x = TwoU16s {one: 22, two: 23};

src/test/run-pass/extern-pass-TwoU16s.rs

@@ -8,11 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// xfail-test #5744 fails on 32 bit
+
 // Test a foreign function that accepts and returns a struct
 // by value.
 
-// xfail-test #5744
-
 #[deriving(Eq)]
 struct TwoU8s {
     one: u8, two: u8
@@ -22,6 +22,7 @@ extern {
     pub fn rust_dbg_extern_identity_TwoU8s(v: TwoU8s) -> TwoU8s;
 }
 
+#[fixed_stack_segment] #[inline(never)]
 pub fn main() {
     unsafe {
         let x = TwoU8s {one: 22, two: 23};

src/test/run-pass/extern-pass-TwoU8s.rs

@@ -8,5 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
-pub fn main() {  let early_error: @fn(str) -> !  = {|msg| fail!() }; }
+pub fn main() {
+    let early_error: @fn(&str) -> !  = |_msg| { fail!() };
+}

src/test/run-pass/issue-1516.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
 trait T {
     fn print(&self);
 }

src/test/run-pass/issue-3794.rs

@@ -8,11 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test FIXME #3874
 enum PureCounter { PureCounter(uint) }
 
-fn each(self: PureCounter, blk: &fn(v: &uint)) {
-    let PureCounter(ref x) = self;
+fn each(thing: PureCounter, blk: &fn(v: &uint)) {
+    let PureCounter(ref x) = thing;
     blk(x);
 }
 

src/test/run-pass/issue-3874.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
 pub fn main() {
     enum State { BadChar, BadSyntax }
 

src/test/run-pass/issue-3895.rs

@@ -8,13 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
 struct HasNested {
-    mut nest: ~[~[int]],
+    nest: ~[~[int]],
 }
 
 impl HasNested {
-    fn method_push_local(&self) {
+    fn method_push_local(&mut self) {
         self.nest[0].push(0);
     }
 }

src/test/compile-fail/issue-3991.rs renamed to src/test/run-pass/issue-3991.rs

@@ -0,0 +1,32 @@
+// 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.
+
+/*
+# if b { x } else { y } requires identical types for x and y
+*/
+
+fn print1(b: bool, s1: &str, s2: &str) {
+    println(if b { s1 } else { s2 });
+}
+fn print2<'a, 'b>(b: bool, s1: &'a str, s2: &'b str) {
+    println(if b { s1 } else { s2 });
+}
+fn print3(b: bool, s1: &str, s2: &str) {
+    let mut s: &str;
+    if b { s = s1; } else { s = s2; }
+    println(s);
+}
+fn print4<'a, 'b>(b: bool, s1: &'a str, s2: &'b str) {
+    let mut s: &str;
+    if b { s = s1; } else { s = s2; }
+    println(s);
+}
+
+pub fn main() {}

src/test/run-pass/issue-4025.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
-
 type FontTableTag = u32;
 
 trait FontTableTagConversions {

src/test/run-pass/issue-5280.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
 struct A(bool);
 
 fn main() {

src/test/run-pass/issue-5315.rs

@@ -0,0 +1,26 @@
+// 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.
+
+/*
+# Corrupted initialization in the static struct
+
+...should print &[1, 2, 3] but instead prints something like
+&[4492532864, 24]. It is pretty evident that the compiler messed up
+with the representation of [int, ..n] and [int] somehow, or at least
+failed to typecheck correctly.
+*/
+
+struct X { vec: &'static [int] }
+static V: &'static [X] = &[X { vec: &[1, 2, 3] }];
+fn main() {
+    for &v in V.iter() {
+        println(fmt!("%?", v.vec));
+    }
+}