Skip to content

Commit 498f0d2

Browse files
msullivangraydon
authored andcommitted
---
yaml --- r: 2870 b: refs/heads/master c: 78b0d33 h: refs/heads/master v: v3
1 parent 32e5733 commit 498f0d2

File tree

6 files changed

+42
-8
lines changed

6 files changed

+42
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: fd1029e6dd3ec685cc496a0f129e39590a61830d
2+
refs/heads/master: 78b0d33c3552e47d9472f8ea4c1fb996a21597dc

trunk/src/test/compile-fail/move-not-variable.rs

Lines changed: 0 additions & 4 deletions
This file was deleted.

trunk/src/test/run-pass/move-1.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
use std;
2-
import std::uint;
3-
41
fn test(bool x, @tup(int, int, int) foo) -> int {
52
auto bar = foo;
63
let @tup(int,int,int) y;

trunk/src/test/run-pass/move-2.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
fn main() {
2+
auto x = @tup(1,2,3);
3+
auto y <- x;
4+
assert (y._1 == 2);
5+
}

trunk/src/test/run-pass/move-3.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
use std;
2+
import std::uint;
3+
4+
fn test(bool x, @tup(int, int, int) foo) -> int {
5+
auto bar = foo;
6+
let @tup(int,int,int) y;
7+
if (x) {
8+
y <- bar;
9+
} else {
10+
y = @tup(4,5,6);
11+
}
12+
ret y._1;
13+
}
14+
15+
fn main() {
16+
auto x = @tup(1,2,3);
17+
for each (uint i in uint::range(0u, 10000u)) {
18+
assert (test(true, x) == 2);
19+
}
20+
assert (test(false, x) == 5);
21+
}

trunk/src/test/run-pass/move-4.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
use std;
2+
import std::uint;
3+
4+
fn test(@tup(int, int, int) foo) -> @tup(int, int, int) {
5+
auto bar <- foo;
6+
auto baz <- bar;
7+
auto quux <- baz;
8+
ret quux;
9+
}
10+
11+
fn main() {
12+
auto x = @tup(1,2,3);
13+
auto y = test(x);
14+
assert (y._2 == 3);
15+
}

0 commit comments

Comments
 (0)