test: address comments and pacify the merciless tidy.
This commit is contained in:
parent
da33935c26
commit
d69b3b16e5
8 changed files with 16 additions and 20 deletions
|
@ -1,6 +1,3 @@
|
|||
#![crate_type = "lib"]
|
||||
#![crate_name = "nonclike"]
|
||||
|
||||
#[repr(C, u8)]
|
||||
pub enum TT {
|
||||
AA(u64, u64),
|
||||
|
|
|
@ -56,7 +56,7 @@ int main(int argc, char *argv[]) {
|
|||
uint64_t rr = tt_add(xx, yy);
|
||||
assert(33 == rr);
|
||||
|
||||
/* This one returns an incorrect result. */
|
||||
/* This one used to return an incorrect result (see issue #68190). */
|
||||
T x = { .tag = A, .a = { ._0 = 1 } };
|
||||
T y = { .tag = A, .a = { ._0 = 10 } };
|
||||
uint64_t r = t_add(x, y);
|
||||
|
|
|
@ -1,6 +1,3 @@
|
|||
#![crate_type = "bin"]
|
||||
#![crate_name = "nonclike"]
|
||||
|
||||
#[repr(C, u8)]
|
||||
pub enum TT {
|
||||
AA(u64, u64),
|
||||
|
|
|
@ -1,6 +1,3 @@
|
|||
#![crate_type = "bin"]
|
||||
#![crate_name = "nonclike"]
|
||||
|
||||
#[repr(C, u8)]
|
||||
pub enum TT {
|
||||
AA(u64, u64),
|
||||
|
|
|
@ -1,6 +1,3 @@
|
|||
#![crate_type = "lib"]
|
||||
#![crate_name = "nonclike"]
|
||||
|
||||
#[repr(C, u8)]
|
||||
pub enum TT {
|
||||
AA(u64, u64),
|
||||
|
|
|
@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
|
|||
assert(10 == tt.aa._0);
|
||||
assert(20 == tt.aa._1);
|
||||
|
||||
/* This one segfaults. */
|
||||
/* This one used to segfault (see issue #68190). */
|
||||
T t = t_new(10);
|
||||
assert(A == t.tag);
|
||||
assert(10 == t.a._0);
|
||||
|
|
|
@ -139,7 +139,11 @@ mod tests {
|
|||
pub fn rust_dbg_abi_2(f: Floats) -> Floats;
|
||||
pub fn rust_dbg_new_some_u64u64(a: u64, b: u64) -> U8TaggedEnumOptionU64U64;
|
||||
pub fn rust_dbg_new_none_u64u64() -> U8TaggedEnumOptionU64U64;
|
||||
pub fn rust_dbg_unpack_option_u64u64(o: U8TaggedEnumOptionU64U64, a: *mut u64, b: *mut u64) -> i32;
|
||||
pub fn rust_dbg_unpack_option_u64u64(
|
||||
o: U8TaggedEnumOptionU64U64,
|
||||
a: *mut u64,
|
||||
b: *mut u64,
|
||||
) -> i32;
|
||||
pub fn rust_dbg_new_some_u64(some: u64) -> U8TaggedEnumOptionU64;
|
||||
pub fn rust_dbg_new_none_u64() -> U8TaggedEnumOptionU64;
|
||||
pub fn rust_dbg_unpack_option_u64(o: U8TaggedEnumOptionU64, v: *mut u64) -> i32;
|
||||
|
@ -371,14 +375,18 @@ mod tests {
|
|||
|
||||
let mut a: u64 = 0;
|
||||
let mut b: u64 = 0;
|
||||
let r = unsafe { rust_dbg_unpack_option_u64u64(some_u64u64, &mut a as *mut _, &mut b as *mut _) };
|
||||
let r = unsafe {
|
||||
rust_dbg_unpack_option_u64u64(some_u64u64, &mut a as *mut _, &mut b as *mut _)
|
||||
};
|
||||
assert_eq!(1, r);
|
||||
assert_eq!(10, a);
|
||||
assert_eq!(20, b);
|
||||
|
||||
let mut a: u64 = 0;
|
||||
let mut b: u64 = 0;
|
||||
let r = unsafe { rust_dbg_unpack_option_u64u64(none_u64u64, &mut a as *mut _, &mut b as *mut _) };
|
||||
let r = unsafe {
|
||||
rust_dbg_unpack_option_u64u64(none_u64u64, &mut a as *mut _, &mut b as *mut _)
|
||||
};
|
||||
assert_eq!(0, r);
|
||||
assert_eq!(0, a);
|
||||
assert_eq!(0, b);
|
||||
|
|
Loading…
Add table
Reference in a new issue