diff options
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/compile-fail/fru-extra-field.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/liveness-init-in-fru.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/rec-extend.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/record-with-resource.rs | 2 | ||||
| -rw-r--r-- | src/test/run-fail/issue-948.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/issue-2463.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass/morestack4.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/rec-extend.rs | 4 |
8 files changed, 10 insertions, 10 deletions
diff --git a/src/test/compile-fail/fru-extra-field.rs b/src/test/compile-fail/fru-extra-field.rs index 7d070c47f46..47ed293e5c0 100644 --- a/src/test/compile-fail/fru-extra-field.rs +++ b/src/test/compile-fail/fru-extra-field.rs @@ -7,5 +7,5 @@ type point = {x: int, y: int}; fn main() { let origin: point = {x: 0, y: 0}; - let origin3d: point = {z: 0 with origin}; + let origin3d: point = {z: 0,.. origin}; } diff --git a/src/test/compile-fail/liveness-init-in-fru.rs b/src/test/compile-fail/liveness-init-in-fru.rs index f6ba7c32792..4939364621d 100644 --- a/src/test/compile-fail/liveness-init-in-fru.rs +++ b/src/test/compile-fail/liveness-init-in-fru.rs @@ -4,6 +4,6 @@ type point = {x: int, y: int}; fn main() { let mut origin: point; - origin = {x: 10 with origin}; //~ ERROR use of possibly uninitialized variable: `origin` + origin = {x: 10,.. origin}; //~ ERROR use of possibly uninitialized variable: `origin` copy origin; } diff --git a/src/test/compile-fail/rec-extend.rs b/src/test/compile-fail/rec-extend.rs index a223aa00d87..06593df79df 100644 --- a/src/test/compile-fail/rec-extend.rs +++ b/src/test/compile-fail/rec-extend.rs @@ -4,5 +4,5 @@ fn main() { let a = {foo: 0i}; - let b = {foo: true with a}; + let b = {foo: true,.. a}; } diff --git a/src/test/compile-fail/record-with-resource.rs b/src/test/compile-fail/record-with-resource.rs index 3540f03e800..e194f73c753 100644 --- a/src/test/compile-fail/record-with-resource.rs +++ b/src/test/compile-fail/record-with-resource.rs @@ -9,7 +9,7 @@ struct my_resource { fn main() { { let a = {x: 0, y: my_resource(20)}; - let b = {x: 2 with a}; + let b = {x: 2,.. a}; log(error, (a, b)); } } diff --git a/src/test/run-fail/issue-948.rs b/src/test/run-fail/issue-948.rs index abc67f7c4aa..db29bbaaf64 100644 --- a/src/test/run-fail/issue-948.rs +++ b/src/test/run-fail/issue-948.rs @@ -1,5 +1,5 @@ // error-pattern:beep boop fn main() { let origin = {x: 0, y: 0}; - let f: {x:int,y:int} = {x: (fail ~"beep boop") with origin}; + let f: {x:int,y:int} = {x: (fail ~"beep boop"),.. origin}; } diff --git a/src/test/run-pass/issue-2463.rs b/src/test/run-pass/issue-2463.rs index f6d600e48b6..da7b06f4652 100644 --- a/src/test/run-pass/issue-2463.rs +++ b/src/test/run-pass/issue-2463.rs @@ -8,12 +8,12 @@ fn main() { let y = { f: 1, g: 1, - with x + .. x }; let z = { f: 1, - with x + .. x }; } diff --git a/src/test/run-pass/morestack4.rs b/src/test/run-pass/morestack4.rs index 13200ee4ec9..50bf3f4d3a1 100644 --- a/src/test/run-pass/morestack4.rs +++ b/src/test/run-pass/morestack4.rs @@ -47,7 +47,7 @@ type biggy = { fn getbig(i: biggy) { if i.a00 != 0u64 { - getbig({a00: i.a00 - 1u64 with i}); + getbig({a00: i.a00 - 1u64,.. i}); } } diff --git a/src/test/run-pass/rec-extend.rs b/src/test/run-pass/rec-extend.rs index cd0d089d28a..32754146e46 100644 --- a/src/test/run-pass/rec-extend.rs +++ b/src/test/run-pass/rec-extend.rs @@ -6,8 +6,8 @@ type point = {x: int, y: int}; fn main() { let origin: point = {x: 0, y: 0}; - let right: point = {x: origin.x + 10 with origin}; - let up: point = {y: origin.y + 10 with origin}; + let right: point = {x: origin.x + 10,.. origin}; + let up: point = {y: origin.y + 10,.. origin}; assert (origin.x == 0); assert (origin.y == 0); assert (right.x == 10); |
