Skip to content

Commit a83db81

Browse files
committed
Update tests
1 parent 47f1d67 commit a83db81

File tree

2 files changed

+26
-5
lines changed

2 files changed

+26
-5
lines changed

src/test/compile-fail/repeat_count.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fn main() {
1919
//~| found `()`
2020
//~| expected usize
2121
//~| found ()
22-
//~| ERROR expected constant integer for repeat count, found non-constant expression
22+
//~| ERROR expected positive integer for repeat count, found tuple
2323
let c = [0; true];
2424
//~^ ERROR mismatched types
2525
//~| expected `usize`

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

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,35 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
struct MyStruct { field: uint }
11+
struct MyStruct { field: usize }
12+
struct Nested { nested: MyStruct }
13+
struct Mix2 { nested: ((usize,),) }
14+
1215
const STRUCT: MyStruct = MyStruct { field: 42 };
13-
const TUP: (uint,) = (43,);
16+
const TUP: (usize,) = (43,);
17+
const NESTED_S: Nested = Nested { nested: MyStruct { field: 5 } };
18+
const NESTED_T: ((usize,),) = ((4,),);
19+
const MIX_1: ((Nested,),) = ((Nested { nested: MyStruct { field: 3 } },),);
20+
const MIX_2: Mix2 = Mix2 { nested: ((2,),) };
21+
const INSTANT_1: usize = (MyStruct { field: 1 }).field;
22+
const INSTANT_2: usize = (0,).0;
1423

1524
fn main() {
1625
let a = [0; STRUCT.field];
1726
let b = [0; TUP.0];
27+
let c = [0; NESTED_S.nested.field];
28+
let d = [0; (NESTED_T.0).0];
29+
let e = [0; (MIX_1.0).0.nested.field];
30+
let f = [0; (MIX_2.nested.0).0];
31+
let g = [0; INSTANT_1];
32+
let h = [0; INSTANT_2];
1833

19-
assert!(a.len() == 42);
20-
assert!(b.len() == 43);
34+
assert_eq!(a.len(), 42);
35+
assert_eq!(b.len(), 43);
36+
assert_eq!(c.len(), 5);
37+
assert_eq!(d.len(), 4);
38+
assert_eq!(e.len(), 3);
39+
assert_eq!(f.len(), 2);
40+
assert_eq!(g.len(), 1);
41+
assert_eq!(h.len(), 0);
2142
}

0 commit comments

Comments
 (0)