From 2ecb9fe8e93870cb4ff8b2efff02cba8bf5186bf Mon Sep 17 00:00:00 2001 From: Lucian Popescu Date: Tue, 12 May 2026 16:25:48 +0100 Subject: [PATCH 1/2] Drop integer suffix when visiting integer literal --- cpp2rust/converter/converter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp2rust/converter/converter.cpp b/cpp2rust/converter/converter.cpp index 0aeea072..5c65831d 100644 --- a/cpp2rust/converter/converter.cpp +++ b/cpp2rust/converter/converter.cpp @@ -1643,7 +1643,7 @@ bool Converter::VisitIntegerLiteral(clang::IntegerLiteral *expr) { computed_expr_type_ = ComputedExprType::FreshValue; return false; } - StrCat(getIntegerLiteral(expr, Mapper::Map(expr->getType()) != "i32")); + StrCat(getIntegerLiteral(expr, false)); computed_expr_type_ = ComputedExprType::FreshValue; return false; } From 78a8aece50f4ed11c5d59ef15ab72a0436fc7ff2 Mon Sep 17 00:00:00 2001 From: Lucian Popescu Date: Wed, 13 May 2026 09:53:08 +0100 Subject: [PATCH 2/2] Update tests --- tests/benchmarks/out/refcount/sum.rs | 2 +- tests/benchmarks/out/unsafe/sum.rs | 2 +- .../out/refcount/bool_condition_logical.rs | 26 +++++++++--------- .../out/refcount/bool_condition_logical_c.rs | 27 +++++++++---------- .../unit/out/refcount/int_to_bool_explicit.rs | 2 +- .../out/refcount/int_to_bool_explicit_c.rs | 2 +- tests/unit/out/refcount/printfs.rs | 2 +- .../out/refcount/reinterpret_cast_aliased.rs | 12 ++++----- .../out/refcount/reinterpret_cast_chain.rs | 10 +++---- .../out/refcount/reinterpret_cast_double.rs | 2 +- .../refcount/reinterpret_cast_large_array.rs | 2 +- .../reinterpret_cast_partial_overlap.rs | 2 +- .../refcount/reinterpret_cast_u32_from_u8.rs | 2 +- .../refcount/reinterpret_cast_zero_init.rs | 2 +- tests/unit/out/refcount/types.rs | 2 +- tests/unit/out/refcount/va_arg_mixed_types.rs | 4 +-- .../unit/out/unsafe/bool_condition_logical.rs | 26 +++++++++--------- .../out/unsafe/bool_condition_logical_c.rs | 26 +++++++++--------- tests/unit/out/unsafe/int_to_bool_explicit.rs | 2 +- .../unit/out/unsafe/int_to_bool_explicit_c.rs | 2 +- tests/unit/out/unsafe/printfs.rs | 2 +- .../out/unsafe/reinterpret_cast_aliased.rs | 12 ++++----- .../unit/out/unsafe/reinterpret_cast_chain.rs | 8 +++--- .../out/unsafe/reinterpret_cast_double.rs | 2 +- .../unsafe/reinterpret_cast_large_array.rs | 2 +- .../reinterpret_cast_partial_overlap.rs | 2 +- .../unsafe/reinterpret_cast_u32_from_u8.rs | 2 +- .../out/unsafe/reinterpret_cast_zero_init.rs | 2 +- tests/unit/out/unsafe/types.rs | 2 +- tests/unit/out/unsafe/union_cross_arm_cast.rs | 5 ++-- .../unsafe/union_pointer_pun_writethrough.rs | 2 +- .../out/unsafe/union_void_ptr_sized_deref.rs | 2 +- tests/unit/out/unsafe/va_arg_mixed_types.rs | 4 +-- 33 files changed, 100 insertions(+), 104 deletions(-) diff --git a/tests/benchmarks/out/refcount/sum.rs b/tests/benchmarks/out/refcount/sum.rs index cd41f598..ff52f6a6 100644 --- a/tests/benchmarks/out/refcount/sum.rs +++ b/tests/benchmarks/out/refcount/sum.rs @@ -10,7 +10,7 @@ pub fn main() { std::process::exit(main_0()); } fn main_0() -> i32 { - let N: Value = Rc::new(RefCell::new(25000000000_i64)); + let N: Value = Rc::new(RefCell::new(25000000000)); let sum: Value = Rc::new(RefCell::new(0_i64)); let i: Value = Rc::new(RefCell::new(0_i64)); let j: Value = Rc::new(RefCell::new((*N.borrow()))); diff --git a/tests/benchmarks/out/unsafe/sum.rs b/tests/benchmarks/out/unsafe/sum.rs index e674ebe4..2ccb6b0b 100644 --- a/tests/benchmarks/out/unsafe/sum.rs +++ b/tests/benchmarks/out/unsafe/sum.rs @@ -12,7 +12,7 @@ pub fn main() { } } unsafe fn main_0() -> i32 { - let mut N: i64 = 25000000000_i64; + let mut N: i64 = 25000000000; let mut sum: i64 = 0_i64; let mut i: i64 = 0_i64; let mut j: i64 = N; diff --git a/tests/unit/out/refcount/bool_condition_logical.rs b/tests/unit/out/refcount/bool_condition_logical.rs index 7101b5d0..9af97490 100644 --- a/tests/unit/out/refcount/bool_condition_logical.rs +++ b/tests/unit/out/refcount/bool_condition_logical.rs @@ -86,16 +86,16 @@ fn main_0() -> i32 { assert!(((*side_effect.with(Value::clone).borrow()) == 0)); let x: Value = Rc::new(RefCell::new(5)); let y: Value = Rc::new(RefCell::new(3)); - let flags: Value = Rc::new(RefCell::new(2_u32)); - if ((*x.borrow()) > (*y.borrow())) || (((*flags.borrow()) & 1_u32) != 0) { + let flags: Value = Rc::new(RefCell::new(2)); + if ((*x.borrow()) > (*y.borrow())) || (((*flags.borrow()) & 1) != 0) { assert!(true); } - if ((*x.borrow()) < (*y.borrow())) || (((*flags.borrow()) & 1_u32) != 0) { + if ((*x.borrow()) < (*y.borrow())) || (((*flags.borrow()) & 1) != 0) { assert!(false); } - let a: Value = Rc::new(RefCell::new(1_u32)); - let b: Value = Rc::new(RefCell::new(2_u32)); - let c: Value = Rc::new(RefCell::new(3_u32)); + let a: Value = Rc::new(RefCell::new(1)); + let b: Value = Rc::new(RefCell::new(2)); + let c: Value = Rc::new(RefCell::new(3)); if ((*a.borrow()) != (*c.borrow())) && ((*b.borrow()) != (*c.borrow())) { assert!(true); } @@ -103,27 +103,27 @@ fn main_0() -> i32 { if (!((*p.borrow()).is_null())) && ((*s.borrow()) < 0) { assert!(true); } - let k: Value = Rc::new(RefCell::new(2_u32)); + let k: Value = Rc::new(RefCell::new(2)); let done: Value = Rc::new(RefCell::new(false)); - if ((*k.borrow()) > 1_u32) || (!(*done.borrow())) { + if ((*k.borrow()) > 1) || (!(*done.borrow())) { assert!(true); } - if ((*x.borrow()) > (*y.borrow())) || (((*flags.borrow()) & 4_u32) != 0) { + if ((*x.borrow()) > (*y.borrow())) || (((*flags.borrow()) & 4) != 0) { assert!(true); } - let ull: Value = Rc::new(RefCell::new(7_u64)); + let ull: Value = Rc::new(RefCell::new(7)); if (!((*p.borrow()).is_null())) && ((*ull.borrow()) != 0) { assert!(true); } if ((*x.borrow()) > (*y.borrow())) && ((*ull.borrow()) != 0) { assert!(true); } - let mask: Value = Rc::new(RefCell::new(((1_i64 << 4) | (1_i64 << 5)))); - let bits: Value = Rc::new(RefCell::new((1_i64 << 4))); + let mask: Value = Rc::new(RefCell::new(((1 << 4) | (1 << 5)))); + let bits: Value = Rc::new(RefCell::new((1 << 4))); if ((*n.borrow()) != 0) && (((*bits.borrow()) & (*mask.borrow())) != 0) { assert!(true); } - if ((*n.borrow()) != 0) || (((*bits.borrow()) & 256_i64) != 0) { + if ((*n.borrow()) != 0) || (((*bits.borrow()) & 256) != 0) { assert!(true); } let cp: Value> = Rc::new(RefCell::new(Ptr::from_string_literal("hi"))); diff --git a/tests/unit/out/refcount/bool_condition_logical_c.rs b/tests/unit/out/refcount/bool_condition_logical_c.rs index de5a8563..77e17fcb 100644 --- a/tests/unit/out/refcount/bool_condition_logical_c.rs +++ b/tests/unit/out/refcount/bool_condition_logical_c.rs @@ -92,22 +92,22 @@ fn main_0() -> i32 { assert!(((((*side_effect.with(Value::clone).borrow()) == 0) as i32) != 0)); let x: Value = Rc::new(RefCell::new(5)); let y: Value = Rc::new(RefCell::new(3)); - let flags: Value = Rc::new(RefCell::new(2_u32)); - if (((((((*x.borrow()) > (*y.borrow())) as i32) != 0) || (((*flags.borrow()) & 1_u32) != 0)) + let flags: Value = Rc::new(RefCell::new(2)); + if (((((((*x.borrow()) > (*y.borrow())) as i32) != 0) || (((*flags.borrow()) & 1) != 0)) as i32) != 0) { assert!((1 != 0)); } - if (((((((*x.borrow()) < (*y.borrow())) as i32) != 0) || (((*flags.borrow()) & 1_u32) != 0)) + if (((((((*x.borrow()) < (*y.borrow())) as i32) != 0) || (((*flags.borrow()) & 1) != 0)) as i32) != 0) { assert!((0 != 0)); } - let a: Value = Rc::new(RefCell::new(1_u32)); - let b: Value = Rc::new(RefCell::new(2_u32)); - let c: Value = Rc::new(RefCell::new(3_u32)); + let a: Value = Rc::new(RefCell::new(1)); + let b: Value = Rc::new(RefCell::new(2)); + let c: Value = Rc::new(RefCell::new(3)); if (((((((*a.borrow()) != (*c.borrow())) as i32) != 0) && ((((*b.borrow()) != (*c.borrow())) as i32) != 0)) as i32) != 0) @@ -121,34 +121,33 @@ fn main_0() -> i32 { { assert!((1 != 0)); } - let k: Value = Rc::new(RefCell::new(2_u32)); + let k: Value = Rc::new(RefCell::new(2)); let done: Value = Rc::new(RefCell::new((0 != 0))); - if (((((((*k.borrow()) > 1_u32) as i32) != 0) || (!(*done.borrow()))) as i32) != 0) { + if (((((((*k.borrow()) > 1) as i32) != 0) || (!(*done.borrow()))) as i32) != 0) { assert!((1 != 0)); } - if (((((((*x.borrow()) > (*y.borrow())) as i32) != 0) || (((*flags.borrow()) & 4_u32) != 0)) + if (((((((*x.borrow()) > (*y.borrow())) as i32) != 0) || (((*flags.borrow()) & 4) != 0)) as i32) != 0) { assert!((1 != 0)); } - let ull: Value = Rc::new(RefCell::new(7_u64)); + let ull: Value = Rc::new(RefCell::new(7)); if ((((((!((*p.borrow()).is_null())) as i32) != 0) && ((*ull.borrow()) != 0)) as i32) != 0) { assert!((1 != 0)); } if (((((((*x.borrow()) > (*y.borrow())) as i32) != 0) && ((*ull.borrow()) != 0)) as i32) != 0) { assert!((1 != 0)); } - let mask: Value = Rc::new(RefCell::new(((1_i64 << 4) | (1_i64 << 5)))); - let bits: Value = Rc::new(RefCell::new((1_i64 << 4))); + let mask: Value = Rc::new(RefCell::new(((1 << 4) | (1 << 5)))); + let bits: Value = Rc::new(RefCell::new((1 << 4))); if (((((((*n.borrow()) != 0) as i32) != 0) && (((*bits.borrow()) & (*mask.borrow())) != 0)) as i32) != 0) { assert!((1 != 0)); } - if (((((((*n.borrow()) != 0) as i32) != 0) || (((*bits.borrow()) & 256_i64) != 0)) as i32) != 0) - { + if (((((((*n.borrow()) != 0) as i32) != 0) || (((*bits.borrow()) & 256) != 0)) as i32) != 0) { assert!((1 != 0)); } let cp: Value> = Rc::new(RefCell::new(Ptr::from_string_literal("hi"))); diff --git a/tests/unit/out/refcount/int_to_bool_explicit.rs b/tests/unit/out/refcount/int_to_bool_explicit.rs index 4024521f..7a99519d 100644 --- a/tests/unit/out/refcount/int_to_bool_explicit.rs +++ b/tests/unit/out/refcount/int_to_bool_explicit.rs @@ -12,7 +12,7 @@ pub fn main() { fn main_0() -> i32 { let flag: Value = Rc::new(RefCell::new(7_u32)); let b1: Value = Rc::new(RefCell::new(((*flag.borrow()) != 0))); - let b2: Value = Rc::new(RefCell::new((0_u32 != 0))); + let b2: Value = Rc::new(RefCell::new((0 != 0))); assert!((*b1.borrow())); assert!(!(*b2.borrow())); return 0; diff --git a/tests/unit/out/refcount/int_to_bool_explicit_c.rs b/tests/unit/out/refcount/int_to_bool_explicit_c.rs index 0bd69774..16c809a4 100644 --- a/tests/unit/out/refcount/int_to_bool_explicit_c.rs +++ b/tests/unit/out/refcount/int_to_bool_explicit_c.rs @@ -12,7 +12,7 @@ pub fn main() { fn main_0() -> i32 { let flag: Value = Rc::new(RefCell::new(7_u32)); let b1: Value = Rc::new(RefCell::new(((*flag.borrow()) != 0))); - let b2: Value = Rc::new(RefCell::new((0_u32 != 0))); + let b2: Value = Rc::new(RefCell::new((0 != 0))); assert!((*b1.borrow())); assert!(((!(*b2.borrow()) as i32) != 0)); return 0; diff --git a/tests/unit/out/refcount/printfs.rs b/tests/unit/out/refcount/printfs.rs index a9e59666..1a9ada05 100644 --- a/tests/unit/out/refcount/printfs.rs +++ b/tests/unit/out/refcount/printfs.rs @@ -24,7 +24,7 @@ pub fn main() { } fn main_0() -> i32 { println!("{}", Ptr::from_string_literal("fprintf stdout")); - println!("{} {} {}", 1, 2_u32, 3_i64); + println!("{} {} {}", 1, 2, 3); print!("hello world"); println!("{}", Ptr::from_string_literal("printf")); print!("hello world"); diff --git a/tests/unit/out/refcount/reinterpret_cast_aliased.rs b/tests/unit/out/refcount/reinterpret_cast_aliased.rs index 30bc2836..32462b61 100644 --- a/tests/unit/out/refcount/reinterpret_cast_aliased.rs +++ b/tests/unit/out/refcount/reinterpret_cast_aliased.rs @@ -15,11 +15,11 @@ fn main_0() -> i32 { Rc::new(RefCell::new((val.as_pointer()).reinterpret_cast::())); let view2: Value> = Rc::new(RefCell::new((val.as_pointer()).reinterpret_cast::())); - (*view1.borrow()).offset((0) as isize).write(3721182122_u32); - assert!((((*view2.borrow()).offset((0) as isize).read()) == 3721182122_u32)); - assert!(((*val.borrow()) == 578437699406183338_u64)); - (*view2.borrow()).offset((1) as isize).write(4293844428_u32); - assert!((((*view1.borrow()).offset((1) as isize).read()) == 4293844428_u32)); - assert!(((*val.borrow()) == 18441921396093008810_u64)); + (*view1.borrow()).offset((0) as isize).write(3721182122); + assert!((((*view2.borrow()).offset((0) as isize).read()) == 3721182122)); + assert!(((*val.borrow()) == 578437699406183338)); + (*view2.borrow()).offset((1) as isize).write(4293844428); + assert!((((*view1.borrow()).offset((1) as isize).read()) == 4293844428)); + assert!(((*val.borrow()) == 18441921396093008810)); return 0; } diff --git a/tests/unit/out/refcount/reinterpret_cast_chain.rs b/tests/unit/out/refcount/reinterpret_cast_chain.rs index 7a330b8c..24961044 100644 --- a/tests/unit/out/refcount/reinterpret_cast_chain.rs +++ b/tests/unit/out/refcount/reinterpret_cast_chain.rs @@ -23,12 +23,10 @@ fn main_0() -> i32 { assert!(((((*words.borrow()).offset((2) as isize).read()) as i32) == 1541)); assert!(((((*words.borrow()).offset((3) as isize).read()) as i32) == 2055)); (*words.borrow()).offset((1) as isize).write(48042_u16); - assert!((((*dwords.borrow()).offset((0) as isize).read()) == 3148481025_u32)); - assert!(((*val.borrow()) == 578437698833482241_u64)); - (*dwords.borrow()) - .offset((1) as isize) - .write(4293844428_u32); - assert!(((*val.borrow()) == 18441921395520307713_u64)); + assert!((((*dwords.borrow()).offset((0) as isize).read()) == 3148481025)); + assert!(((*val.borrow()) == 578437698833482241)); + (*dwords.borrow()).offset((1) as isize).write(4293844428); + assert!(((*val.borrow()) == 18441921395520307713)); assert!(((((*words.borrow()).offset((2) as isize).read()) as i32) == 56780)); assert!(((((*words.borrow()).offset((3) as isize).read()) as i32) == 65518)); return 0; diff --git a/tests/unit/out/refcount/reinterpret_cast_double.rs b/tests/unit/out/refcount/reinterpret_cast_double.rs index d50ca376..cab6f924 100644 --- a/tests/unit/out/refcount/reinterpret_cast_double.rs +++ b/tests/unit/out/refcount/reinterpret_cast_double.rs @@ -12,7 +12,7 @@ pub fn main() { fn main_0() -> i32 { let d: Value = Rc::new(RefCell::new(1.0E+0)); let bits: Value> = Rc::new(RefCell::new((d.as_pointer()).reinterpret_cast::())); - assert!((((*bits.borrow()).read()) == 4607182418800017408_u64)); + assert!((((*bits.borrow()).read()) == 4607182418800017408)); (*bits.borrow()).write(4614256656552045848_u64); assert!(((*d.borrow()) > 3.14E+0) && ((*d.borrow()) < 3.15E+0)); return 0; diff --git a/tests/unit/out/refcount/reinterpret_cast_large_array.rs b/tests/unit/out/refcount/reinterpret_cast_large_array.rs index f593d306..e7edd4df 100644 --- a/tests/unit/out/refcount/reinterpret_cast_large_array.rs +++ b/tests/unit/out/refcount/reinterpret_cast_large_array.rs @@ -23,7 +23,7 @@ fn main_0() -> i32 { } (*arr.borrow()) .offset(((*N.borrow()) - 1) as isize) - .write(3148519816_u32); + .write(3148519816); let words: Value> = Rc::new(RefCell::new( ((*arr.borrow()).reinterpret_cast::()).clone(), )); diff --git a/tests/unit/out/refcount/reinterpret_cast_partial_overlap.rs b/tests/unit/out/refcount/reinterpret_cast_partial_overlap.rs index 793bf41e..3dc23d1a 100644 --- a/tests/unit/out/refcount/reinterpret_cast_partial_overlap.rs +++ b/tests/unit/out/refcount/reinterpret_cast_partial_overlap.rs @@ -17,7 +17,7 @@ fn main_0() -> i32 { assert!(((((*bytes.borrow()).offset((3) as isize).read()) as i32) == 4)); assert!(((((*bytes.borrow()).offset((4) as isize).read()) as i32) == 5)); (*bytes.borrow()).offset((3) as isize).write(255_u8); - assert!(((*arr.borrow())[(0) as usize] == 4278387201_u32)); + assert!(((*arr.borrow())[(0) as usize] == 4278387201)); (*bytes.borrow()).offset((4) as isize).write(170_u8); assert!(((*arr.borrow())[(1) as usize] == 134678186_u32)); return 0; diff --git a/tests/unit/out/refcount/reinterpret_cast_u32_from_u8.rs b/tests/unit/out/refcount/reinterpret_cast_u32_from_u8.rs index 4101a4e0..33134749 100644 --- a/tests/unit/out/refcount/reinterpret_cast_u32_from_u8.rs +++ b/tests/unit/out/refcount/reinterpret_cast_u32_from_u8.rs @@ -17,6 +17,6 @@ fn main_0() -> i32 { (arr.as_pointer() as Ptr).reinterpret_cast::(), )); assert!((((*dwords.borrow()).offset((0) as isize).read()) == 305419896_u32)); - assert!((((*dwords.borrow()).offset((1) as isize).read()) == 2427178479_u32)); + assert!((((*dwords.borrow()).offset((1) as isize).read()) == 2427178479)); return 0; } diff --git a/tests/unit/out/refcount/reinterpret_cast_zero_init.rs b/tests/unit/out/refcount/reinterpret_cast_zero_init.rs index c4811a12..5a189054 100644 --- a/tests/unit/out/refcount/reinterpret_cast_zero_init.rs +++ b/tests/unit/out/refcount/reinterpret_cast_zero_init.rs @@ -16,6 +16,6 @@ fn main_0() -> i32 { (*bytes.borrow()).offset((1) as isize).write(190_u8); (*bytes.borrow()).offset((2) as isize).write(173_u8); (*bytes.borrow()).offset((3) as isize).write(222_u8); - assert!(((*val.borrow()) == 3735928559_u32)); + assert!(((*val.borrow()) == 3735928559)); return 0; } diff --git a/tests/unit/out/refcount/types.rs b/tests/unit/out/refcount/types.rs index 1489f3ee..789a60d9 100644 --- a/tests/unit/out/refcount/types.rs +++ b/tests/unit/out/refcount/types.rs @@ -20,7 +20,7 @@ fn main_0() -> i32 { let xi2: Value = Rc::new(RefCell::new(16_i16)); let xi3: Value = Rc::new(RefCell::new(32)); let xi4: Value = Rc::new(RefCell::new(64_i64)); - let b: Value = Rc::new(RefCell::new(((*xu64.borrow()) == 64_u64))); + let b: Value = Rc::new(RefCell::new(((*xu64.borrow()) == 64))); return ((((((((((((((*xu8.borrow()) as i32) + ((*xu16.borrow()) as i32)) as u32) .wrapping_add((*xu32.borrow()))) as u64) .wrapping_add((*xu64.borrow()))) diff --git a/tests/unit/out/refcount/va_arg_mixed_types.rs b/tests/unit/out/refcount/va_arg_mixed_types.rs index a841fcfb..da9cda06 100644 --- a/tests/unit/out/refcount/va_arg_mixed_types.rs +++ b/tests/unit/out/refcount/va_arg_mixed_types.rs @@ -41,7 +41,7 @@ fn main_0() -> i32 { 1.into(), 2.05E+1.into(), 2.into(), - 30_i64.into(), + 30.into(), ], ) }) == 60) as i32) @@ -57,7 +57,7 @@ fn main_0() -> i32 { assert!( (((({ let _count: i32 = 2; - sum_mixed_0(_count, &[1.into(), 3.7E+0.into(), 2.into(), 100_i64.into()]) + sum_mixed_0(_count, &[1.into(), 3.7E+0.into(), 2.into(), 100.into()]) }) == 103) as i32) != 0) ); diff --git a/tests/unit/out/unsafe/bool_condition_logical.rs b/tests/unit/out/unsafe/bool_condition_logical.rs index bc1fdcd7..56badaeb 100644 --- a/tests/unit/out/unsafe/bool_condition_logical.rs +++ b/tests/unit/out/unsafe/bool_condition_logical.rs @@ -83,16 +83,16 @@ unsafe fn main_0() -> i32 { assert!(((side_effect) == (0))); let mut x: i32 = 5; let mut y: i32 = 3; - let mut flags: u32 = 2_u32; - if ((x) > (y)) || (((flags) & (1_u32)) != 0) { + let mut flags: u32 = 2; + if ((x) > (y)) || (((flags) & (1)) != 0) { assert!(true); } - if ((x) < (y)) || (((flags) & (1_u32)) != 0) { + if ((x) < (y)) || (((flags) & (1)) != 0) { assert!(false); } - let mut a: u32 = 1_u32; - let mut b: u32 = 2_u32; - let mut c: u32 = 3_u32; + let mut a: u32 = 1; + let mut b: u32 = 2; + let mut c: u32 = 3; if ((a) != (c)) && ((b) != (c)) { assert!(true); } @@ -100,27 +100,27 @@ unsafe fn main_0() -> i32 { if (!((p).is_null())) && ((s) < (0)) { assert!(true); } - let mut k: u32 = 2_u32; + let mut k: u32 = 2; let mut done: bool = false; - if ((k) > (1_u32)) || (!done) { + if ((k) > (1)) || (!done) { assert!(true); } - if ((x) > (y)) || (((flags) & (4_u32)) != 0) { + if ((x) > (y)) || (((flags) & (4)) != 0) { assert!(true); } - let mut ull: u64 = 7_u64; + let mut ull: u64 = 7; if (!((p).is_null())) && (ull != 0) { assert!(true); } if ((x) > (y)) && (ull != 0) { assert!(true); } - let mut mask: i64 = (((1_i64) << (4)) | ((1_i64) << (5))); - let mut bits: i64 = ((1_i64) << (4)); + let mut mask: i64 = (((1) << (4)) | ((1) << (5))); + let mut bits: i64 = ((1) << (4)); if ((n) != (0)) && (((bits) & (mask)) != 0) { assert!(true); } - if ((n) != (0)) || (((bits) & (256_i64)) != 0) { + if ((n) != (0)) || (((bits) & (256)) != 0) { assert!(true); } let mut cp: *const u8 = b"hi\0".as_ptr(); diff --git a/tests/unit/out/unsafe/bool_condition_logical_c.rs b/tests/unit/out/unsafe/bool_condition_logical_c.rs index 14c77990..adb49d82 100644 --- a/tests/unit/out/unsafe/bool_condition_logical_c.rs +++ b/tests/unit/out/unsafe/bool_condition_logical_c.rs @@ -88,16 +88,16 @@ unsafe fn main_0() -> i32 { assert!(((((side_effect) == (0)) as i32) != 0)); let mut x: i32 = 5; let mut y: i32 = 3; - let mut flags: u32 = 2_u32; - if (((((((x) > (y)) as i32) != 0) || (((flags) & (1_u32)) != 0)) as i32) != 0) { + let mut flags: u32 = 2; + if (((((((x) > (y)) as i32) != 0) || (((flags) & (1)) != 0)) as i32) != 0) { assert!((1 != 0)); } - if (((((((x) < (y)) as i32) != 0) || (((flags) & (1_u32)) != 0)) as i32) != 0) { + if (((((((x) < (y)) as i32) != 0) || (((flags) & (1)) != 0)) as i32) != 0) { assert!((0 != 0)); } - let mut a: u32 = 1_u32; - let mut b: u32 = 2_u32; - let mut c: u32 = 3_u32; + let mut a: u32 = 1; + let mut b: u32 = 2; + let mut c: u32 = 3; if (((((((a) != (c)) as i32) != 0) && ((((b) != (c)) as i32) != 0)) as i32) != 0) { assert!((1 != 0)); } @@ -105,27 +105,27 @@ unsafe fn main_0() -> i32 { if ((((((!((p).is_null())) as i32) != 0) && ((((s) < (0)) as i32) != 0)) as i32) != 0) { assert!((1 != 0)); } - let mut k: u32 = 2_u32; + let mut k: u32 = 2; let mut done: bool = (0 != 0); - if (((((((k) > (1_u32)) as i32) != 0) || (!done)) as i32) != 0) { + if (((((((k) > (1)) as i32) != 0) || (!done)) as i32) != 0) { assert!((1 != 0)); } - if (((((((x) > (y)) as i32) != 0) || (((flags) & (4_u32)) != 0)) as i32) != 0) { + if (((((((x) > (y)) as i32) != 0) || (((flags) & (4)) != 0)) as i32) != 0) { assert!((1 != 0)); } - let mut ull: u64 = 7_u64; + let mut ull: u64 = 7; if ((((((!((p).is_null())) as i32) != 0) && (ull != 0)) as i32) != 0) { assert!((1 != 0)); } if (((((((x) > (y)) as i32) != 0) && (ull != 0)) as i32) != 0) { assert!((1 != 0)); } - let mut mask: i64 = (((1_i64) << (4)) | ((1_i64) << (5))); - let mut bits: i64 = ((1_i64) << (4)); + let mut mask: i64 = (((1) << (4)) | ((1) << (5))); + let mut bits: i64 = ((1) << (4)); if (((((((n) != (0)) as i32) != 0) && (((bits) & (mask)) != 0)) as i32) != 0) { assert!((1 != 0)); } - if (((((((n) != (0)) as i32) != 0) || (((bits) & (256_i64)) != 0)) as i32) != 0) { + if (((((((n) != (0)) as i32) != 0) || (((bits) & (256)) != 0)) as i32) != 0) { assert!((1 != 0)); } let mut cp: *const u8 = b"hi\0".as_ptr().cast_mut().cast_const(); diff --git a/tests/unit/out/unsafe/int_to_bool_explicit.rs b/tests/unit/out/unsafe/int_to_bool_explicit.rs index 10d0a906..65d57d68 100644 --- a/tests/unit/out/unsafe/int_to_bool_explicit.rs +++ b/tests/unit/out/unsafe/int_to_bool_explicit.rs @@ -14,7 +14,7 @@ pub fn main() { unsafe fn main_0() -> i32 { let mut flag: u32 = 7_u32; let mut b1: bool = (flag != 0); - let mut b2: bool = (0_u32 != 0); + let mut b2: bool = (0 != 0); assert!(b1); assert!(!b2); return 0; diff --git a/tests/unit/out/unsafe/int_to_bool_explicit_c.rs b/tests/unit/out/unsafe/int_to_bool_explicit_c.rs index 2062c57d..9b2202e6 100644 --- a/tests/unit/out/unsafe/int_to_bool_explicit_c.rs +++ b/tests/unit/out/unsafe/int_to_bool_explicit_c.rs @@ -14,7 +14,7 @@ pub fn main() { unsafe fn main_0() -> i32 { let mut flag: u32 = 7_u32; let mut b1: bool = (flag != 0); - let mut b2: bool = (0_u32 != 0); + let mut b2: bool = (0 != 0); assert!(b1); assert!(((!b2 as i32) != 0)); return 0; diff --git a/tests/unit/out/unsafe/printfs.rs b/tests/unit/out/unsafe/printfs.rs index 9e3e799f..e94bdecc 100644 --- a/tests/unit/out/unsafe/printfs.rs +++ b/tests/unit/out/unsafe/printfs.rs @@ -32,7 +32,7 @@ unsafe fn main_0() -> i32 { b"%s\n\0".as_ptr() as *const i8, b"fprintf stdout\0".as_ptr(), ); - printf(b"%d %u %ld\n\0".as_ptr() as *const i8, 1, 2_u32, 3_i64); + printf(b"%d %u %ld\n\0".as_ptr() as *const i8, 1, 2, 3); printf(b"hello world\0".as_ptr() as *const i8); printf(b"%s\n\0".as_ptr() as *const i8, b"printf\0".as_ptr()); printf(b"hello world\0".as_ptr() as *const i8); diff --git a/tests/unit/out/unsafe/reinterpret_cast_aliased.rs b/tests/unit/out/unsafe/reinterpret_cast_aliased.rs index 07b06f02..8a318396 100644 --- a/tests/unit/out/unsafe/reinterpret_cast_aliased.rs +++ b/tests/unit/out/unsafe/reinterpret_cast_aliased.rs @@ -15,11 +15,11 @@ unsafe fn main_0() -> i32 { let mut val: u64 = 578437695752307201_u64; let mut view1: *mut u32 = ((&mut val as *mut u64) as *mut u32); let mut view2: *mut u32 = ((&mut val as *mut u64) as *mut u32); - (*view1.offset((0) as isize)) = 3721182122_u32; - assert!(((*view2.offset((0) as isize)) == (3721182122_u32))); - assert!(((val) == (578437699406183338_u64))); - (*view2.offset((1) as isize)) = 4293844428_u32; - assert!(((*view1.offset((1) as isize)) == (4293844428_u32))); - assert!(((val) == (18441921396093008810_u64))); + (*view1.offset((0) as isize)) = 3721182122; + assert!(((*view2.offset((0) as isize)) == (3721182122))); + assert!(((val) == (578437699406183338))); + (*view2.offset((1) as isize)) = 4293844428; + assert!(((*view1.offset((1) as isize)) == (4293844428))); + assert!(((val) == (18441921396093008810))); return 0; } diff --git a/tests/unit/out/unsafe/reinterpret_cast_chain.rs b/tests/unit/out/unsafe/reinterpret_cast_chain.rs index ee944c2b..5087c1f7 100644 --- a/tests/unit/out/unsafe/reinterpret_cast_chain.rs +++ b/tests/unit/out/unsafe/reinterpret_cast_chain.rs @@ -22,10 +22,10 @@ unsafe fn main_0() -> i32 { assert!((((*words.offset((2) as isize)) as i32) == (1541))); assert!((((*words.offset((3) as isize)) as i32) == (2055))); (*words.offset((1) as isize)) = 48042_u16; - assert!(((*dwords.offset((0) as isize)) == (3148481025_u32))); - assert!(((val) == (578437698833482241_u64))); - (*dwords.offset((1) as isize)) = 4293844428_u32; - assert!(((val) == (18441921395520307713_u64))); + assert!(((*dwords.offset((0) as isize)) == (3148481025))); + assert!(((val) == (578437698833482241))); + (*dwords.offset((1) as isize)) = 4293844428; + assert!(((val) == (18441921395520307713))); assert!((((*words.offset((2) as isize)) as i32) == (56780))); assert!((((*words.offset((3) as isize)) as i32) == (65518))); return 0; diff --git a/tests/unit/out/unsafe/reinterpret_cast_double.rs b/tests/unit/out/unsafe/reinterpret_cast_double.rs index b8a67888..a50abe01 100644 --- a/tests/unit/out/unsafe/reinterpret_cast_double.rs +++ b/tests/unit/out/unsafe/reinterpret_cast_double.rs @@ -14,7 +14,7 @@ pub fn main() { unsafe fn main_0() -> i32 { let mut d: f64 = 1.0E+0; let mut bits: *mut u64 = ((&mut d as *mut f64) as *mut u64); - assert!(((*bits) == (4607182418800017408_u64))); + assert!(((*bits) == (4607182418800017408))); (*bits) = 4614256656552045848_u64; assert!(((d) > (3.14E+0)) && ((d) < (3.15E+0))); return 0; diff --git a/tests/unit/out/unsafe/reinterpret_cast_large_array.rs b/tests/unit/out/unsafe/reinterpret_cast_large_array.rs index 9808e2b0..3642abf5 100644 --- a/tests/unit/out/unsafe/reinterpret_cast_large_array.rs +++ b/tests/unit/out/unsafe/reinterpret_cast_large_array.rs @@ -20,7 +20,7 @@ unsafe fn main_0() -> i32 { (*arr.offset((i) as isize)) = 0_u32; i.postfix_inc(); } - (*arr.offset(((N) - (1)) as isize)) = 3148519816_u32; + (*arr.offset(((N) - (1)) as isize)) = 3148519816; let mut words: *mut u16 = (arr as *mut u16); assert!((((*words.offset((((N) * (2)) - (1)) as isize)) as i32) == (48042))); assert!((((*words.offset((((N) * (2)) - (2)) as isize)) as i32) == (39304))); diff --git a/tests/unit/out/unsafe/reinterpret_cast_partial_overlap.rs b/tests/unit/out/unsafe/reinterpret_cast_partial_overlap.rs index 8f7af66e..ba29ef9b 100644 --- a/tests/unit/out/unsafe/reinterpret_cast_partial_overlap.rs +++ b/tests/unit/out/unsafe/reinterpret_cast_partial_overlap.rs @@ -17,7 +17,7 @@ unsafe fn main_0() -> i32 { assert!((((*bytes.offset((3) as isize)) as i32) == (4))); assert!((((*bytes.offset((4) as isize)) as i32) == (5))); (*bytes.offset((3) as isize)) = 255_u8; - assert!(((arr[(0) as usize]) == (4278387201_u32))); + assert!(((arr[(0) as usize]) == (4278387201))); (*bytes.offset((4) as isize)) = 170_u8; assert!(((arr[(1) as usize]) == (134678186_u32))); return 0; diff --git a/tests/unit/out/unsafe/reinterpret_cast_u32_from_u8.rs b/tests/unit/out/unsafe/reinterpret_cast_u32_from_u8.rs index 1d2fd383..b9ae817d 100644 --- a/tests/unit/out/unsafe/reinterpret_cast_u32_from_u8.rs +++ b/tests/unit/out/unsafe/reinterpret_cast_u32_from_u8.rs @@ -15,6 +15,6 @@ unsafe fn main_0() -> i32 { let mut arr: [u8; 8] = [120_u8, 86_u8, 52_u8, 18_u8, 239_u8, 205_u8, 171_u8, 144_u8]; let mut dwords: *mut u32 = (arr.as_mut_ptr() as *mut u32); assert!(((*dwords.offset((0) as isize)) == (305419896_u32))); - assert!(((*dwords.offset((1) as isize)) == (2427178479_u32))); + assert!(((*dwords.offset((1) as isize)) == (2427178479))); return 0; } diff --git a/tests/unit/out/unsafe/reinterpret_cast_zero_init.rs b/tests/unit/out/unsafe/reinterpret_cast_zero_init.rs index c810d066..c8795bd9 100644 --- a/tests/unit/out/unsafe/reinterpret_cast_zero_init.rs +++ b/tests/unit/out/unsafe/reinterpret_cast_zero_init.rs @@ -18,6 +18,6 @@ unsafe fn main_0() -> i32 { (*bytes.offset((1) as isize)) = 190_u8; (*bytes.offset((2) as isize)) = 173_u8; (*bytes.offset((3) as isize)) = 222_u8; - assert!(((val) == (3735928559_u32))); + assert!(((val) == (3735928559))); return 0; } diff --git a/tests/unit/out/unsafe/types.rs b/tests/unit/out/unsafe/types.rs index ff70426f..52c5fac3 100644 --- a/tests/unit/out/unsafe/types.rs +++ b/tests/unit/out/unsafe/types.rs @@ -22,7 +22,7 @@ unsafe fn main_0() -> i32 { let xi2: i16 = 16_i16; let mut xi3: i32 = 32; let mut xi4: i64 = 64_i64; - let mut b: bool = ((xu64) == (64_u64)); + let mut b: bool = ((xu64) == (64)); return (((((((((((((xu8 as i32) + (xu16 as i32)) as u32).wrapping_add(xu32)) as u64) .wrapping_add(xu64)) .wrapping_add(xsz1)) diff --git a/tests/unit/out/unsafe/union_cross_arm_cast.rs b/tests/unit/out/unsafe/union_cross_arm_cast.rs index ecc6ac93..82d8019e 100644 --- a/tests/unit/out/unsafe/union_cross_arm_cast.rs +++ b/tests/unit/out/unsafe/union_cross_arm_cast.rs @@ -75,9 +75,8 @@ unsafe fn main_0() -> i32 { }; c.u.a.code = 10_u16; c.len = (::std::mem::size_of::() as u64 as u32); - (*(((&mut c.u.a as *mut shape_a) as *mut ::libc::c_void) as *mut shape_b)).tail = - 3735928559_u32; - assert!(((((c.u.b.tail) == (3735928559_u32)) as i32) != 0)); + (*(((&mut c.u.a as *mut shape_a) as *mut ::libc::c_void) as *mut shape_b)).tail = 3735928559; + assert!(((((c.u.b.tail) == (3735928559)) as i32) != 0)); assert!(((((c.u.b.code as i32) == (10)) as i32) != 0)); c.u.b.lo = 8080_u16; assert!( diff --git a/tests/unit/out/unsafe/union_pointer_pun_writethrough.rs b/tests/unit/out/unsafe/union_pointer_pun_writethrough.rs index 172ad396..81efe03d 100644 --- a/tests/unit/out/unsafe/union_pointer_pun_writethrough.rs +++ b/tests/unit/out/unsafe/union_pointer_pun_writethrough.rs @@ -26,7 +26,7 @@ unsafe fn main_0() -> i32 { }; let mut pp: anon_0 = ::default(); pp.as_signed = (&mut x as *mut i64); - (*pp.as_unsigned) = 42_u64; + (*pp.as_unsigned) = 42; assert!(((((x) == (42_i64)) as i32) != 0)); return 0; } diff --git a/tests/unit/out/unsafe/union_void_ptr_sized_deref.rs b/tests/unit/out/unsafe/union_void_ptr_sized_deref.rs index 83977a80..7f3540af 100644 --- a/tests/unit/out/unsafe/union_void_ptr_sized_deref.rs +++ b/tests/unit/out/unsafe/union_void_ptr_sized_deref.rs @@ -79,7 +79,7 @@ unsafe fn main_0() -> i32 { let _count: i64 = 1234605616436508552_i64; write_count_0(_s, _count) }); - assert!(((((buf64) == (1234605616436508552_i64)) as i32) != 0)); + assert!(((((buf64) == (1234605616436508552)) as i32) != 0)); s.width = Width::W_32; s.out.handle = ((&mut buf32 as *mut i32) as *mut i32 as *mut ::libc::c_void); (unsafe { diff --git a/tests/unit/out/unsafe/va_arg_mixed_types.rs b/tests/unit/out/unsafe/va_arg_mixed_types.rs index 3e2c680a..b19b8309 100644 --- a/tests/unit/out/unsafe/va_arg_mixed_types.rs +++ b/tests/unit/out/unsafe/va_arg_mixed_types.rs @@ -42,7 +42,7 @@ unsafe fn main_0() -> i32 { 1.into(), 2.05E+1.into(), 2.into(), - 30_i64.into(), + 30.into(), ], ) }) == (60)) as i32) @@ -58,7 +58,7 @@ unsafe fn main_0() -> i32 { assert!( ((((unsafe { let _count: i32 = 2; - sum_mixed_0(_count, &[1.into(), 3.7E+0.into(), 2.into(), 100_i64.into()]) + sum_mixed_0(_count, &[1.into(), 3.7E+0.into(), 2.into(), 100.into()]) }) == (103)) as i32) != 0) );