Skip to content

Commit 8758126

Browse files
committed
---
yaml --- r: 38775 b: refs/heads/incoming c: 8468c40 h: refs/heads/master i: 38773: 28d6b8c 38771: 3e81486 38767: 7062199 v: v3
1 parent 29892f2 commit 8758126

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
9-
refs/heads/incoming: 1a3a70760b4dfe03e135f28b5456d61752d3e677
9+
refs/heads/incoming: 8468c40fdef3544169ea5b06b5b9905a5d448495
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/test/run-pass/string-self-append.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ fn main() {
88
while i > 0 {
99
log(error, str::len(a));
1010
assert (str::len(a) == expected_len);
11-
a += a;
11+
a = a + a; // FIXME(#3387)---can't write a += a
1212
i -= 1;
1313
expected_len *= 2u;
1414
}
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
fn main() { let a = ~[1, 2, 3, 4, 5]; let mut b = ~[a, a]; b += b; }
1+
fn main() {
2+
let a = ~[1, 2, 3, 4, 5];
3+
let mut b = ~[a, a];
4+
b = b + b; // FIXME(#3387)---can't write b += b
5+
}

branches/incoming/src/test/run-pass/vec-self-append.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ extern mod std;
33
fn test_heap_to_heap() {
44
// a spills onto the heap
55
let mut a = ~[0, 1, 2, 3, 4];
6-
a += a;
6+
a = a + a; // FIXME(#3387)---can't write a += a
77
assert (vec::len(a) == 10u);
88
assert (a[0] == 0);
99
assert (a[1] == 1);
@@ -21,7 +21,7 @@ fn test_stack_to_heap() {
2121
// a is entirely on the stack
2222
let mut a = ~[0, 1, 2];
2323
// a spills to the heap
24-
a += a;
24+
a = a + a; // FIXME(#3387)---can't write a += a
2525
assert (vec::len(a) == 6u);
2626
assert (a[0] == 0);
2727
assert (a[1] == 1);
@@ -39,7 +39,7 @@ fn test_loop() {
3939
while i > 0 {
4040
log(error, vec::len(a));
4141
assert (vec::len(a) == expected_len);
42-
a += a;
42+
a = a + a; // FIXME(#3387)---can't write a += a
4343
i -= 1;
4444
expected_len *= 2u;
4545
}

0 commit comments

Comments
 (0)