Skip to content

Commit 3586903

Browse files
committed
---
yaml --- r: 37831 b: refs/heads/try c: e1685dd h: refs/heads/master i: 37829: f6036b0 37827: d1d344b 37823: af7f2a4 v: v3
1 parent 325fa57 commit 3586903

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
5-
refs/heads/try: 608403227075586dfe676916bdce6796eef3d9bb
5+
refs/heads/try: e1685dd9904f1c9d734ac50f85e2d35c9c4356b7
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/test/auxiliary/issue-2631-a.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ type header_map = HashMap<~str, @DVec<@~str>>;
1212

1313
// the unused ty param is necessary so this gets monomorphized
1414
fn request<T: Copy>(req: header_map) {
15-
let _x = *(copy *req.get(~"METHOD"))[0u];
15+
let _x = copy *(copy *req.get(~"METHOD"))[0u];
1616
}

branches/try/src/test/run-pass/alt-implicit-copy-unique.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
fn main() {
22
let x = ~{mut a: ~10, b: ~20};
33
match x {
4-
~{a: ref a, b: ref b} => {
4+
~{a: ref mut a, b: ref mut b} => {
55
assert **a == 10; (*x).a = ~30; assert **a == 30;
66
}
77
}

branches/try/src/test/run-pass/class-exports.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ mod kitty {
1212
}
1313

1414
impl cat {
15-
fn get_name() -> ~str { self.name }
15+
fn get_name() -> ~str { copy self.name }
1616
}
1717

1818
fn cat(in_name: ~str) -> cat {
@@ -26,4 +26,4 @@ mod kitty {
2626

2727
fn main() {
2828
assert(cat(~"Spreckles").get_name() == ~"Spreckles");
29-
}
29+
}

branches/try/src/test/run-pass/class-separate-impl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn cat(in_x : uint, in_y : int, in_name: ~str) -> cat {
4545
}
4646

4747
impl cat: ToStr {
48-
pure fn to_str() -> ~str { self.name }
48+
pure fn to_str() -> ~str { copy self.name }
4949
}
5050

5151
fn print_out<T: ToStr>(thing: T, expected: ~str) {

branches/try/src/test/run-pass/getopts_ref.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fn main() {
99
match getopts(args, opts) {
1010
result::Ok(ref m) =>
1111
assert !opt_present(m, "b"),
12-
result::Err(ref f) => fail fail_str(*f)
12+
result::Err(ref f) => fail fail_str(copy *f)
1313
};
1414

1515
}

branches/try/src/test/run-pass/last-use-is-capture.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ fn main() {
44
fn invoke(f: fn@()) { f(); }
55
let k = ~22;
66
let _u = {a: copy k};
7-
invoke(|| log(error, k) )
7+
invoke(|| log(error, copy k) )
88
}

branches/try/src/test/run-pass/operator-overloading.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ impl Point : ops::Neg<Point> {
2525
}
2626

2727
impl Point : ops::Index<bool,int> {
28-
pure fn index(+x: bool) -> int {
28+
pure fn index(&self, +x: bool) -> int {
2929
if x { self.x } else { self.y }
3030
}
3131
}

branches/try/src/test/run-pass/ret-break-cont-in-block.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fn iter<T>(v: ~[T], it: fn(T) -> bool) {
1313

1414
fn find_pos<T:Eq>(n: T, h: ~[T]) -> Option<uint> {
1515
let mut i = 0u;
16-
for iter(h) |e| {
16+
for iter(copy h) |e| {
1717
if e == n { return Some(i); }
1818
i += 1u;
1919
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
fn main() {
22
let i = ~mut 1;
33
// Should be a copy
4-
let j = i;
4+
let j = copy i;
55
*i = 2;
66
*j = 3;
77
assert *i == 2;
88
assert *j == 3;
9-
}
9+
}

0 commit comments

Comments
 (0)