Skip to content

Commit cedd794

Browse files
committed
Added a functioning version of the assoc-oddities-3 test case to
run-pass. Added run-pass/issue-28777 to demonstrate behavior of this parsing modification.
1 parent ae47972 commit cedd794

File tree

2 files changed

+51
-0
lines changed

2 files changed

+51
-0
lines changed

src/test/run-pass/assoc-oddities-3.rs

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// Copyright 2015 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+
fn that_odd_parse(c: bool, n: usize) -> u32 {
12+
let x = 2;
13+
let a = [1, 2, 3, 4];
14+
let b = [5, 6, 7, 7];
15+
x + if c { a } else { b }[n]
16+
}
17+
18+
fn main() {
19+
assert_eq!(4, that_odd_parse(true, 1));
20+
assert_eq!(8, that_odd_parse(false, 1));
21+
}

src/test/run-pass/issue-28777.rs

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// Copyright 2015 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+
fn main() {
12+
let v1 = { 1 + {2} * {3} };
13+
let v2 = 1 + {2} * {3} ;
14+
15+
assert_eq!(7, v1);
16+
assert_eq!(7, v2);
17+
18+
let v3;
19+
v3 = { 1 + {2} * {3} };
20+
let v4;
21+
v4 = 1 + {2} * {3};
22+
assert_eq!(7, v3);
23+
assert_eq!(7, v4);
24+
25+
let v5 = { 1 + {2} * 3 };
26+
assert_eq!(7, v5);
27+
28+
let v9 = { 1 + if 1 > 2 {1} else {2} * {3} };
29+
assert_eq!(7, v9);
30+
}

0 commit comments

Comments
 (0)