Skip to content

Commit 72e3cab

Browse files
committed
Change to deafult with suffix
1 parent e37e151 commit 72e3cab

27 files changed

Lines changed: 37 additions & 42 deletions

cpp2rust/converter/converter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2733,11 +2733,11 @@ std::string Converter::GetDefaultAsStringFallback(clang::QualType qual_type) {
27332733
}
27342734

27352735
if (qual_type->isIntegerType()) {
2736-
return std::format("0 as {}", ToString(qual_type));
2736+
return std::format("0_{}", ToString(qual_type));
27372737
}
27382738

27392739
if (qual_type->isFloatingType()) {
2740-
return std::format("0.0 as {}", ToString(qual_type));
2740+
return std::format("0.0_{}", ToString(qual_type));
27412741
}
27422742

27432743
return std::format("<{}>::default()", ToString(qual_type));

tests/benchmarks/out/unsafe/bfs.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ pub unsafe fn BFS_0(graph: *const Graph, mut start_vertex: u32) -> *mut u32 {
6262
let mut Q: Queue = Queue {
6363
elems: Box::leak(
6464
(0..((*graph).V as u64))
65-
.map(|_| <u32>::default())
65+
.map(|_| 0 as u32)
6666
.collect::<Box<[u32]>>(),
6767
)
6868
.as_mut_ptr(),
@@ -72,13 +72,13 @@ pub unsafe fn BFS_0(graph: *const Graph, mut start_vertex: u32) -> *mut u32 {
7272
};
7373
let mut visited: *mut bool = Box::leak(
7474
(0..((*graph).V as u64))
75-
.map(|_| <bool>::default())
75+
.map(|_| false)
7676
.collect::<Box<[bool]>>(),
7777
)
7878
.as_mut_ptr();
7979
let mut pred: *mut u32 = Box::leak(
8080
(0..((*graph).V as u64))
81-
.map(|_| <u32>::default())
81+
.map(|_| 0 as u32)
8282
.collect::<Box<[u32]>>(),
8383
)
8484
.as_mut_ptr();

tests/ub/out/unsafe/ub10.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub fn main() {
1414
}
1515
unsafe fn main_0() -> i32 {
1616
let mut arr: *mut i32 =
17-
Box::leak((0..10_u64).map(|_| 0 as i32).collect::<Box<[i32]>>()).as_mut_ptr();
17+
Box::leak((0..10_u64).map(|_| 0_i32).collect::<Box<[i32]>>()).as_mut_ptr();
1818
let mut ptr: *mut i32 = arr.offset((1) as isize);
1919
let mut out: i32 = (*ptr);
2020

tests/ub/out/unsafe/ub14.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub fn main() {
1414
}
1515
unsafe fn main_0() -> i32 {
1616
let mut arr1: *mut i32 =
17-
Box::leak((0..100_u64).map(|_| 0 as i32).collect::<Box<[i32]>>()).as_mut_ptr();
17+
Box::leak((0..100_u64).map(|_| 0_i32).collect::<Box<[i32]>>()).as_mut_ptr();
1818
(*arr1.offset((100) as isize)) = 1;
1919

2020
::std::mem::drop(Box::from_raw(::std::slice::from_raw_parts_mut(

tests/ub/out/unsafe/ub15.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub fn main() {
1414
}
1515
unsafe fn main_0() -> i32 {
1616
let mut arr: *mut i32 =
17-
Box::leak((0..15_u64).map(|_| 0 as i32).collect::<Box<[i32]>>()).as_mut_ptr();
17+
Box::leak((0..15_u64).map(|_| 0_i32).collect::<Box<[i32]>>()).as_mut_ptr();
1818
let mut ptr: *mut i32 = arr.offset((15) as isize);
1919
let mut out: i32 = (*ptr);
2020

tests/ub/out/unsafe/ub16.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn main() {
1717
}
1818
unsafe fn main_0() -> i32 {
1919
let mut p1: *mut i32 =
20-
Box::leak((0..10_u64).map(|_| 0 as i32).collect::<Box<[i32]>>()).as_mut_ptr();
20+
Box::leak((0..10_u64).map(|_| 0_i32).collect::<Box<[i32]>>()).as_mut_ptr();
2121
let mut out: i32 = (*(unsafe {
2222
let _a: *mut i32 = (&mut (*p1.offset((1) as isize)) as *mut i32);
2323
foo_0(_a)

tests/ub/out/unsafe/ub20.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn main() {
1717
}
1818
unsafe fn main_0() -> i32 {
1919
let mut x: *mut i32 =
20-
Box::leak((0..10_u64).map(|_| 0 as i32).collect::<Box<[i32]>>()).as_mut_ptr();
20+
Box::leak((0..10_u64).map(|_| 0_i32).collect::<Box<[i32]>>()).as_mut_ptr();
2121
(unsafe {
2222
let _single: *mut i32 = x;
2323
foo_0(_single)

tests/ub/out/unsafe/ub9.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub fn main() {
1414
}
1515
unsafe fn main_0() -> i32 {
1616
let mut arr: *mut i32 =
17-
Box::leak((0..10_u64).map(|_| 0 as i32).collect::<Box<[i32]>>()).as_mut_ptr();
17+
Box::leak((0..10_u64).map(|_| 0_i32).collect::<Box<[i32]>>()).as_mut_ptr();
1818
let mut out: i32 = (*arr.offset((10) as isize));
1919

2020
::std::mem::drop(Box::from_raw(::std::slice::from_raw_parts_mut(

tests/unit/out/unsafe/06_new_array.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ pub fn main() {
1313
}
1414
}
1515
unsafe fn main_0() -> i32 {
16-
let mut e: *mut i32 =
17-
Box::leak((0..2_u64).map(|_| 0 as i32).collect::<Box<[i32]>>()).as_mut_ptr();
16+
let mut e: *mut i32 = Box::leak((0..2_u64).map(|_| 0_i32).collect::<Box<[i32]>>()).as_mut_ptr();
1817
(*e.offset((0) as isize)) = 6;
1918
(*e.offset((1) as isize)) = 7;
2019

tests/unit/out/unsafe/clone_vs_move.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ pub struct Foo {
2222
impl Default for Foo {
2323
fn default() -> Self {
2424
Foo {
25-
x: 0 as i32,
25+
x: 0_i32,
2626
y: <*mut i32>::default(),
2727
z: Default::default(),
28-
a: [0 as i32; 3],
28+
a: [0_i32; 3],
2929
bar: <Bar>::default(),
3030
}
3131
}

0 commit comments

Comments
 (0)