Skip to content

Commit 2669686

Browse files
committed
Delete extra cast
1 parent 523e68d commit 2669686

3 files changed

Lines changed: 19 additions & 26 deletions

File tree

‎cpp2rust/converter/models/converter_refcount.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2341,8 +2341,6 @@ std::string ConverterRefCount::ConvertVarInitValue(clang::QualType qual_type,
23412341
return std::format("Ptr::<{}>::from_string_literal({})", code_unit,
23422342
ToString(expr->IgnoreParens()->IgnoreImplicit()));
23432343
}
2344-
return std::format("({} as {})", ConvertFreshPointer(expr, qual_type),
2345-
ToString(qual_type));
23462344
}
23472345
return ConvertFreshPointer(expr, qual_type);
23482346
}

‎tests/unit/out/refcount/array_reference.rs‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pub fn fill_3(a: Ptr<i32>, v: i32) {
3333
}
3434
}
3535
pub fn sum_twice_4(a: Ptr<i32>) -> i32 {
36-
return (({ sum_2(((a).clone() as Ptr<i32>)) }) + ({ sum_2(((a).clone() as Ptr<i32>)) }));
36+
return (({ sum_2((a).clone()) }) + ({ sum_2((a).clone()) }));
3737
}
3838
pub fn sum_ptr_5(p: Ptr<i32>) -> i32 {
3939
let p: Value<Ptr<i32>> = Rc::new(RefCell::new(p));
@@ -56,15 +56,15 @@ pub fn bump_decayed_8(a: Ptr<i32>) {
5656
pub fn fill_and_sum_9(a: Ptr<i32>, v: i32, out: Ptr<i32>) {
5757
let v: Value<i32> = Rc::new(RefCell::new(v));
5858
({
59-
let _a: Ptr<i32> = ((a).clone() as Ptr<i32>);
59+
let _a: Ptr<i32> = (a).clone();
6060
let _v: i32 = (*v.borrow());
6161
fill_3(_a, _v)
6262
});
63-
let __rhs = ({ sum_twice_4(((a).clone() as Ptr<i32>)) });
63+
let __rhs = ({ sum_twice_4((a).clone()) });
6464
out.write(__rhs);
6565
}
6666
pub fn pick_10(s: Ptr<u8>) -> Ptr<u8> {
67-
return ((s).clone() as Ptr<u8>);
67+
return (s).clone();
6868
}
6969
#[derive(Clone, Record, ByteRepr, VaArg, FnPtrArg, Default)]
7070
#[byte_size(8)]
@@ -105,43 +105,40 @@ pub fn main() {
105105
fn main_0() -> i32 {
106106
assert!((({ len_0(Ptr::<u8>::from_string_literal(b"beta"),) }) == 4));
107107
let buf: Value<Box<[u8]>> = Rc::new(RefCell::new(Box::from(*b"abcd\0")));
108-
assert!((({ len_0((buf.as_pointer() as Ptr<u8>),) }) == 4));
108+
assert!((({ len_0(buf.as_pointer(),) }) == 4));
109109
let arr: Value<Box<[i32]>> = Rc::new(RefCell::new(Box::new([1, 2, 3])));
110-
assert!((({ sum_2((arr.as_pointer() as Ptr<i32>),) }) == 6));
111-
({ fill_3((arr.as_pointer() as Ptr<i32>), 7) });
112-
assert!((({ sum_2((arr.as_pointer() as Ptr<i32>),) }) == 21));
113-
assert!((({ sum_twice_4((arr.as_pointer() as Ptr<i32>),) }) == 42));
110+
assert!((({ sum_2(arr.as_pointer(),) }) == 6));
111+
({ fill_3(arr.as_pointer(), 7) });
112+
assert!((({ sum_2(arr.as_pointer(),) }) == 21));
113+
assert!((({ sum_twice_4(arr.as_pointer(),) }) == 42));
114114
let out: Value<i32> = Rc::new(RefCell::new(0));
115-
({ fill_and_sum_9((arr.as_pointer() as Ptr<i32>), 2, out.as_pointer()) });
115+
({ fill_and_sum_9(arr.as_pointer(), 2, out.as_pointer()) });
116116
assert!(((*out.borrow()) == 12));
117117
assert!(((*arr.borrow())[(0) as usize] == 2));
118118
let lit: Ptr<u8> = Ptr::<u8>::from_string_literal(b"beta");
119-
assert!((({ len_0(((lit).clone() as Ptr<u8>),) }) == 4));
119+
assert!((({ len_0((lit).clone(),) }) == 4));
120120
assert!(
121121
(((elem!(({ pick_10(Ptr::<u8>::from_string_literal(b"beta"),) }), 0).read()) as i32)
122122
== (('b' as u8) as i32))
123123
);
124-
assert!((({ len_0((({ pick_10((buf.as_pointer() as Ptr<u8>),) }) as Ptr<u8>),) }) == 4));
124+
assert!((({ len_0(({ pick_10(buf.as_pointer(),) }),) }) == 4));
125125
let pts: Value<Box<[Point]>> = Rc::new(RefCell::new(Box::new([
126126
Point { x: 1, y: 2 },
127127
Point { x: 3, y: 4 },
128128
])));
129-
assert!((({ sum_points_11((pts.as_pointer() as Ptr<Point>),) }) == 10));
130-
({ shift_points_12((pts.as_pointer() as Ptr<Point>), 10) });
129+
assert!((({ sum_points_11(pts.as_pointer(),) }) == 10));
130+
({ shift_points_12(pts.as_pointer(), 10) });
131131
assert!(({ (*pts.borrow())[(0) as usize].x } == 11));
132132
assert!(({ (*pts.borrow())[(1) as usize].y } == 14));
133-
assert!((({ sum_points_11((pts.as_pointer() as Ptr<Point>),) }) == 30));
134-
assert!(
135-
(({ sum_decayed_6((arr.as_pointer() as Ptr<i32>),) })
136-
== ({ sum_2((arr.as_pointer() as Ptr<i32>),) }))
137-
);
138-
({ bump_decayed_8((arr.as_pointer() as Ptr<i32>)) });
133+
assert!((({ sum_points_11(pts.as_pointer(),) }) == 30));
134+
assert!((({ sum_decayed_6(arr.as_pointer(),) }) == ({ sum_2(arr.as_pointer(),) })));
135+
({ bump_decayed_8(arr.as_pointer()) });
139136
assert!(((*arr.borrow())[(0) as usize] == 3));
140137
let names: Value<Box<[Ptr<u8>]>> = Rc::new(RefCell::new(Box::new([
141138
Ptr::<u8>::from_string_literal(b"ab"),
142139
Ptr::<u8>::from_string_literal(b"cde"),
143140
])));
144-
assert!((({ total_len_13((names.as_pointer() as Ptr<Ptr::<u8>>),) }) == 5));
141+
assert!((({ total_len_13(names.as_pointer(),) }) == 5));
145142
return 0;
146143
}
147144
pub fn __cpp2rust_init_globals() {}

‎tests/unit/out/refcount/size_t_template_param.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ pub fn main() {
4848
fn main_0() -> i32 {
4949
let a1: Value<Box<[usize]>> = Rc::new(RefCell::new(Box::new([1_usize, 2_usize, 3_usize])));
5050
assert!(
51-
(({
52-
array_ref_0(((a1.as_pointer() as Ptr<usize>).reinterpret_cast::<u64>() as Ptr<u64>))
53-
}) == 3_u64)
51+
(({ array_ref_0((a1.as_pointer() as Ptr<usize>).reinterpret_cast::<u64>(),) }) == 3_u64)
5452
);
5553
assert!(((*a1.borrow())[(0) as usize] == 2_usize));
5654
let a2: Value<Box<[usize]>> = Rc::new(RefCell::new(Box::new([4_usize, 5_usize])));

0 commit comments

Comments
 (0)