Skip to content

Commit ca2a390

Browse files
lucic71lucic71
committed
Update tests
1 parent da671a9 commit ca2a390

28 files changed

Lines changed: 119 additions & 79 deletions

‎cpp2rust/converter/converter.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,7 +1407,6 @@ std::optional<std::string> Converter::TryPluginConvert(clang::CallExpr *call) {
14071407
}
14081408

14091409
void Converter::ConvertVariadicArg(clang::Expr *arg) {
1410-
PushParen p(*this);
14111410
if (arg->getType()->isFunctionPointerType()) {
14121411
Convert(arg);
14131412
StrCat(".map_or(::std::ptr::null_mut(), |f| f as *mut ::libc::c_void)");
@@ -1626,7 +1625,10 @@ void Converter::ConvertGenericCallExpr(clang::CallExpr *expr) {
16261625
StrCat("& [");
16271626
for (unsigned i = num_named_params; i < num_args; ++i) {
16281627
auto *arg = expr->getArg(i + arg_begin);
1629-
ConvertVariadicArg(arg);
1628+
{
1629+
PushParen p(*this);
1630+
ConvertVariadicArg(arg);
1631+
}
16301632
StrCat(".into()", token::kComma);
16311633
}
16321634
StrCat(']');

‎rules/cstring/tgt_refcount.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,7 @@ fn f4(a0: AnyPtr, a1: AnyPtr, a2: usize) -> AnyPtr {
2121
a0.memcpy(&a1, a2 as usize);
2222
a0.clone()
2323
}
24+
25+
unsafe fn f7(a0: Ptr<u8>) -> u64 {
26+
a0.to_string_iterator().count() as u64
27+
}

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,24 @@ fn main_0() -> i32 {
4545
assert!(
4646
(((({
4747
let _n: i32 = 2;
48-
top_level_2(_n, &[100.into(), 200.into(), 300.into(), 400.into()])
48+
top_level_2(
49+
_n,
50+
&[(100).into(), (200).into(), (300).into(), (400).into()],
51+
)
4952
}) == 300) as i32)
5053
!= 0)
5154
);
5255
assert!(
5356
(((({
5457
let _n: i32 = 0;
55-
top_level_2(_n, &[42.into(), 99.into()])
58+
top_level_2(_n, &[(42).into(), (99).into()])
5659
}) == 42) as i32)
5760
!= 0)
5861
);
5962
assert!(
6063
(((({
6164
let _n: i32 = 3;
62-
top_level_2(_n, &[1.into(), 2.into(), 3.into(), 4.into()])
65+
top_level_2(_n, &[(1).into(), (2).into(), (3).into(), (4).into()])
6366
}) == 4) as i32)
6467
!= 0)
6568
);

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,24 @@ fn main_0() -> i32 {
2929
assert!(
3030
(((({
3131
let _first: i32 = 1;
32-
sum_ints_0(_first, &[2.into(), 3.into(), 4.into(), 0.into()])
32+
sum_ints_0(_first, &[(2).into(), (3).into(), (4).into(), (0).into()])
3333
}) == 10) as i32)
3434
!= 0)
3535
);
3636
assert!(
3737
(((({
3838
let _first: i32 = 100;
39-
sum_ints_0(_first, &[0.into()])
39+
sum_ints_0(_first, &[(0).into()])
4040
}) == 100) as i32)
4141
!= 0)
4242
);
4343
assert!(
4444
(((({
4545
let _first: i32 = 5;
46-
sum_ints_0(_first, &[5.into(), 5.into(), 5.into(), 5.into(), 0.into()])
46+
sum_ints_0(
47+
_first,
48+
&[(5).into(), (5).into(), (5).into(), (5).into(), (0).into()],
49+
)
4750
}) == 25) as i32)
4851
!= 0)
4952
);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ fn main_0() -> i32 {
2525
(((({
2626
let _verbose: i32 = 1;
2727
let _fmt: Ptr<u8> = Ptr::from_string_literal("%d");
28-
conditional_log_0(_verbose, _fmt, &[42.into()])
28+
conditional_log_0(_verbose, _fmt, &[(42).into()])
2929
}) == 42) as i32)
3030
!= 0)
3131
);
3232
assert!(
3333
(((({
3434
let _verbose: i32 = 0;
3535
let _fmt: Ptr<u8> = Ptr::from_string_literal("%d");
36-
conditional_log_0(_verbose, _fmt, &[99.into()])
36+
conditional_log_0(_verbose, _fmt, &[(99).into()])
3737
}) == -1_i32) as i32)
3838
!= 0)
3939
);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ fn main_0() -> i32 {
3434
assert!(
3535
(((({
3636
let _count: i32 = 3;
37-
sum_with_copy_0(_count, &[10.into(), 20.into(), 30.into()])
37+
sum_with_copy_0(_count, &[(10).into(), (20).into(), (30).into()])
3838
}) == 120) as i32)
3939
!= 0)
4040
);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,22 @@ fn main_0() -> i32 {
5858
assert!(
5959
(((({
6060
let _x: i32 = 5;
61-
apply_unary_3(_x, &[FnPtr::<fn(i32) -> i32>::new(square_0).into()])
61+
apply_unary_3(_x, &[(FnPtr::<fn(i32) -> i32>::new(square_0)).into()])
6262
}) == 25) as i32)
6363
!= 0)
6464
);
6565
assert!(
6666
(((({
6767
let _x: i32 = 7;
68-
apply_unary_3(_x, &[FnPtr::<fn(i32) -> i32>::new(negate_1).into()])
68+
apply_unary_3(_x, &[(FnPtr::<fn(i32) -> i32>::new(negate_1)).into()])
6969
}) == -7_i32) as i32)
7070
!= 0)
7171
);
7272
assert!(
7373
(((({
7474
let _a: i32 = 3;
7575
let _b: i32 = 4;
76-
apply_binary_4(_a, _b, &[FnPtr::<fn(i32, i32) -> i32>::new(add_2).into()])
76+
apply_binary_4(_a, _b, &[(FnPtr::<fn(i32, i32) -> i32>::new(add_2)).into()])
7777
}) == 7) as i32)
7878
!= 0)
7979
);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ fn main_0() -> i32 {
3737
assert!(
3838
(((({
3939
let _count: i32 = 3;
40-
outer_1(_count, &[10.into(), 20.into(), 30.into()])
40+
outer_1(_count, &[(10).into(), (20).into(), (30).into()])
4141
}) == 60) as i32)
4242
!= 0)
4343
);
4444
assert!(
4545
(((({
4646
let _count: i32 = 1;
47-
outer_1(_count, &[42.into()])
47+
outer_1(_count, &[(42).into()])
4848
}) == 42) as i32)
4949
!= 0)
5050
);

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ fn main_0() -> i32 {
3737
mixed_args_0(
3838
_count,
3939
&[
40-
0.into(),
41-
10.into(),
42-
1.into(),
40+
(0).into(),
41+
(10).into(),
42+
(1).into(),
4343
(x.as_pointer()).into(),
44-
0.into(),
45-
20.into(),
44+
(0).into(),
45+
(20).into(),
4646
],
4747
)
4848
}) == 130) as i32)
@@ -52,14 +52,14 @@ fn main_0() -> i32 {
5252
assert!(
5353
(((({
5454
let _count: i32 = 1;
55-
mixed_args_0(_count, &[1.into(), (y.as_pointer()).into()])
55+
mixed_args_0(_count, &[(1).into(), (y.as_pointer()).into()])
5656
}) == 50) as i32)
5757
!= 0)
5858
);
5959
assert!(
6060
(((({
6161
let _count: i32 = 2;
62-
mixed_args_0(_count, &[0.into(), 5.into(), 0.into(), 3.into()])
62+
mixed_args_0(_count, &[(0).into(), (5).into(), (0).into(), (3).into()])
6363
}) == 8) as i32)
6464
!= 0)
6565
);

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ fn main_0() -> i32 {
3636
sum_mixed_0(
3737
_count,
3838
&[
39-
0.into(),
40-
10.into(),
41-
1.into(),
42-
2.05E+1.into(),
43-
2.into(),
44-
30_i64.into(),
39+
(0).into(),
40+
(10).into(),
41+
(1).into(),
42+
(2.05E+1).into(),
43+
(2).into(),
44+
(30_i64).into(),
4545
],
4646
)
4747
}) == 60) as i32)
@@ -50,14 +50,17 @@ fn main_0() -> i32 {
5050
assert!(
5151
(((({
5252
let _count: i32 = 1;
53-
sum_mixed_0(_count, &[0.into(), 42.into()])
53+
sum_mixed_0(_count, &[(0).into(), (42).into()])
5454
}) == 42) as i32)
5555
!= 0)
5656
);
5757
assert!(
5858
(((({
5959
let _count: i32 = 2;
60-
sum_mixed_0(_count, &[1.into(), 3.7E+0.into(), 2.into(), 100_i64.into()])
60+
sum_mixed_0(
61+
_count,
62+
&[(1).into(), (3.7E+0).into(), (2).into(), (100_i64).into()],
63+
)
6164
}) == 103) as i32)
6265
!= 0)
6366
);

0 commit comments

Comments
 (0)