Skip to content

Commit 74353fb

Browse files
committed
---
yaml --- r: 16294 b: refs/heads/try c: a5c9e8d h: refs/heads/master v: v3
1 parent c46491a commit 74353fb

File tree

8 files changed

+19
-13
lines changed

8 files changed

+19
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: feece9814af5ed64ecf1961e4fff9b681f3b45ac
5+
refs/heads/try: a5c9e8d59ed49725550ebd9e60871d51736393b4
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/test/compile-fail/noncopyable-class.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
// Test that a class with a non-copyable field can't be
44
// copied
55
class bar {
6-
new() {}
6+
let x: int;
7+
new(x:int) {self.x = x;}
78
drop {}
89
}
910

1011
class foo {
1112
let i: int;
1213
let j: bar;
13-
new(i:int) { self.i = i; self.j = bar(); }
14+
new(i:int) { self.i = i; self.j = bar(5); }
1415
}
1516

1617
fn main() { let x <- foo(10); let y = x; log(error, x); }

branches/try/src/test/compile-fail/regions-bounds.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
enum an_enum/& { }
66
iface an_iface/& { }
7-
class a_class/& { new() { } }
7+
class a_class/& { let x:int; new(x:int) { self.x = x; } }
88

99
fn a_fn1(e: an_enum/&a) -> an_enum/&b {
1010
ret e; //! ERROR mismatched types: expected `an_enum/&b` but found `an_enum/&a`

branches/try/src/test/compile-fail/vec-res-add.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// error-pattern: copying a noncopyable value
22

33
class r {
4-
new(_i:int) {}
4+
let i:int;
5+
new(i:int) {self.i = i;}
56
drop {}
67
}
78

branches/try/src/test/run-fail/morestack2.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ fn getbig_call_c_and_fail(i: int) {
2121
}
2222

2323
class and_then_get_big_again {
24-
new() {}
24+
let x:int;
25+
new(x:int) {self.x = x;}
2526
drop {
2627
fn getbig(i: int) {
2728
if i != 0 {
@@ -34,7 +35,7 @@ class and_then_get_big_again {
3435

3536
fn main() {
3637
task::spawn {||
37-
let r = and_then_get_big_again();
38+
let r = and_then_get_big_again(4);
3839
getbig_call_c_and_fail(10000);
3940
};
4041
}

branches/try/src/test/run-fail/morestack3.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use std;
66

77
fn getbig_and_fail(&&i: int) {
8-
let _r = and_then_get_big_again();
8+
let _r = and_then_get_big_again(5);
99
if i != 0 {
1010
getbig_and_fail(i - 1);
1111
} else {
@@ -14,7 +14,8 @@ fn getbig_and_fail(&&i: int) {
1414
}
1515

1616
class and_then_get_big_again {
17-
new() {}
17+
let x:int;
18+
new(x:int) {self.x = x;}
1819
drop {
1920
fn getbig(i: int) {
2021
if i != 0 {

branches/try/src/test/run-fail/morestack4.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use std;
66

77
fn getbig_and_fail(&&i: int) {
8-
let r = and_then_get_big_again();
8+
let r = and_then_get_big_again(5);
99
if i != 0 {
1010
getbig_and_fail(i - 1);
1111
} else {
@@ -14,7 +14,8 @@ fn getbig_and_fail(&&i: int) {
1414
}
1515

1616
class and_then_get_big_again {
17-
new() {}
17+
let x:int;
18+
new(x:int) {self.x = x;}
1819
drop {}
1920
}
2021

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
// error-pattern:whatever
22

33
class r {
4+
let x:int;
45
// Setting the exit status after the runtime has already
56
// failed has no effect and the process exits with the
67
// runtime's exit code
78
drop {
89
os::set_exit_status(50);
910
}
10-
new() {}
11+
new(x:int) {self.x = x;}
1112
}
1213

1314
fn main() {
1415
log(error, "whatever");
1516
task::spawn {||
16-
let i = r();
17+
let i = r(5);
1718
};
1819
fail;
1920
}

0 commit comments

Comments
 (0)