Skip to content

Commit eb31ae2

Browse files
committed
Deduplicate and fix a test
1 parent 9d613c2 commit eb31ae2

File tree

2 files changed

+11
-48
lines changed

2 files changed

+11
-48
lines changed

src/test/run-pass/ctfe/union-ice.rs

-45
This file was deleted.

src/test/run-pass/union/union-const-eval-field.rs

+11-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#![feature(const_fn)]
1212

13-
type Field1 = i32;
13+
type Field1 = (i32, u32);
1414
type Field2 = f32;
1515
type Field3 = i64;
1616

@@ -21,7 +21,7 @@ union DummyUnion {
2121
}
2222

2323
const FLOAT1_AS_I32: i32 = 1065353216;
24-
const UNION: DummyUnion = DummyUnion { field1: FLOAT1_AS_I32 };
24+
const UNION: DummyUnion = DummyUnion { field1: (FLOAT1_AS_I32, 0) };
2525

2626
const fn read_field1() -> Field1 {
2727
const FIELD1: Field1 = unsafe { UNION.field1 };
@@ -39,7 +39,15 @@ const fn read_field3() -> Field3 {
3939
}
4040

4141
fn main() {
42-
assert_eq!(read_field1(), FLOAT1_AS_I32);
42+
let foo = FLOAT1_AS_I32;
43+
assert_eq!(read_field1().0, foo);
44+
assert_eq!(read_field1().0, FLOAT1_AS_I32);
45+
46+
let foo = 1.0;
47+
assert_eq!(read_field2(), foo);
4348
assert_eq!(read_field2(), 1.0);
49+
4450
assert_eq!(read_field3(), unsafe { UNION.field3 });
51+
let foo = unsafe { UNION.field3 };
52+
assert_eq!(read_field3(), foo);
4553
}

0 commit comments

Comments
 (0)