Skip to content

Commit ce612c5

Browse files
committed
---
yaml --- r: 134235 b: refs/heads/auto c: 0e230c0 h: refs/heads/master i: 134233: 8b14e64 134231: 6ca4fb1 v: v3
1 parent 8c25d72 commit ce612c5

File tree

2 files changed

+38
-1
lines changed

2 files changed

+38
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 3863b68df490dab6bcaccef39039382d47ffb226
16+
refs/heads/auto: 0e230c04dd2b66b6d7e13312c0f0bf37b306d52b
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// Test that the parser does not attempt to parse struct literals
12+
// within assignments in if expressions.
13+
14+
struct Foo {
15+
foo: uint
16+
}
17+
18+
fn main() {
19+
let x = 1u;
20+
let y: Foo;
21+
22+
// `x { ... }` should not be interpreted as a struct literal here
23+
if x = x {
24+
//~^ ERROR mismatched types: expected `bool`, found `()` (expected bool, found ())
25+
println!("{}", x);
26+
}
27+
// Explicit parentheses on the left should match behavior of above
28+
if (x = x) {
29+
//~^ ERROR mismatched types: expected `bool`, found `()` (expected bool, found ())
30+
println!("{}", x);
31+
}
32+
// The struct literal interpretation is fine with explicit parentheses on the right
33+
if y = (Foo { foo: x }) {
34+
//~^ ERROR mismatched types: expected `bool`, found `()` (expected bool, found ())
35+
println!("{}", x);
36+
}
37+
}

0 commit comments

Comments
 (0)