Skip to content

Commit 3feb15b

Browse files
thedatakingthedataking
committed
tests/integration: Update c2rust-postprocess cache entries for json-c
1 parent 0dd6a19 commit 3feb15b

71 files changed

Lines changed: 804 additions & 707 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/internal-testsuite.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
# `update = none` is set, which makes this not work, so we need to update them manually.
4141
# See `.gitmodules` for more info.
4242
submodules: false
43-
43+
4444
- name: Checkout submodules
4545
run: |
4646
git submodule update --init --checkout tests/integration/tests/curl/repo
@@ -129,7 +129,7 @@ jobs:
129129
export C2RUST_DIR=$PWD
130130
# Needs to be run from `tests/integration/` (or further inside)
131131
# to correctly load the `pyproject.toml`.
132-
(cd tests/integration && ./test.py curl json-c lua nginx zstd libxml2 python2 libmcs)
132+
(cd tests/integration && ./test.py ./test.py curl json-c lua nginx zstd libxml2 python2 libmcs)
133133
134134
- uses: actions/upload-artifact@v4
135135
with:

c2rust-postprocess/tests/llm-cache/CommentTransfer/_json_c_set_last_err/9adf00d95ad0a6f053bb53b6cd6f44351e53f231893f4c9666ed52cf00d9921a/metadata.toml renamed to c2rust-postprocess/tests/llm-cache/CommentTransfer/_json_c_set_last_err/fb382342868472bec62abc2d1622940d0cc38260f04f8d809e377f88b880d282/metadata.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ response = """#[no_mangle]
55
66
pub unsafe extern "C" fn _json_c_set_last_err(
77
mut err_fmt: *const ::core::ffi::c_char,
8-
mut args: ...
8+
mut c2rust_args: ...
99
) {
1010
let mut ap: ::core::ffi::VaListImpl;
11-
ap = args.clone();
11+
ap = c2rust_args.clone();
1212
// Ignore (attempted) overruns from snprintf
1313
vsnprintf(
1414
&raw mut _last_err as *mut ::core::ffi::c_char,
@@ -42,10 +42,10 @@ Rust function:
4242
4343
pub unsafe extern "C" fn _json_c_set_last_err(
4444
mut err_fmt: *const ::core::ffi::c_char,
45-
mut args: ...
45+
mut c2rust_args: ...
4646
) {
4747
let mut ap: ::core::ffi::VaListImpl;
48-
ap = args.clone();
48+
ap = c2rust_args.clone();
4949
vsnprintf(
5050
&raw mut _last_err as *mut ::core::ffi::c_char,
5151
::core::mem::size_of::<[::core::ffi::c_char; 256]>() as size_t,

c2rust-postprocess/tests/llm-cache/CommentTransfer/_json_c_set_last_err/9adf00d95ad0a6f053bb53b6cd6f44351e53f231893f4c9666ed52cf00d9921a/response.txt renamed to c2rust-postprocess/tests/llm-cache/CommentTransfer/_json_c_set_last_err/fb382342868472bec62abc2d1622940d0cc38260f04f8d809e377f88b880d282/response.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
pub unsafe extern "C" fn _json_c_set_last_err(
44
mut err_fmt: *const ::core::ffi::c_char,
5-
mut args: ...
5+
mut c2rust_args: ...
66
) {
77
let mut ap: ::core::ffi::VaListImpl;
8-
ap = args.clone();
8+
ap = c2rust_args.clone();
99
// Ignore (attempted) overruns from snprintf
1010
vsnprintf(
1111
&raw mut _last_err as *mut ::core::ffi::c_char,

c2rust-postprocess/tests/llm-cache/CommentTransfer/_json_c_visit/74372ced09d061616fb9dfc91f6f63ab6388eb2f6a682fee1630f82ee6936a07/metadata.toml renamed to c2rust-postprocess/tests/llm-cache/CommentTransfer/_json_c_visit/f533bfb5ea7ecc504f19c2942031e04d7104fb910f97bb59a927cd2d570b4dab/metadata.toml

Lines changed: 29 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ unsafe extern "C" fn _json_c_visit(
2020
);
2121
match userret {
2222
crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE => {}
23-
crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP
24-
| crate::src::json_visit::JSON_C_VISIT_RETURN_POP
25-
| crate::src::json_visit::JSON_C_VISIT_RETURN_STOP
26-
| crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR => return userret,
23+
crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP |
24+
crate::src::json_visit::JSON_C_VISIT_RETURN_POP |
25+
crate::src::json_visit::JSON_C_VISIT_RETURN_STOP |
26+
crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR => return userret,
2727
_ => {
2828
fprintf(
2929
stderr,
30-
b"ERROR: invalid return value from json_c_visit userfunc: %d\\n\\0" as *const u8
30+
b"ERROR: invalid return value from json_c_visit userfunc: %d\\n\\0".as_ptr()
3131
as *const ::core::ffi::c_char,
3232
userret,
3333
);
@@ -42,15 +42,15 @@ unsafe extern "C" fn _json_c_visit(
4242
4 => {
4343
let mut key: *mut ::core::ffi::c_char = ::core::ptr::null_mut::<::core::ffi::c_char>();
4444
let mut child: *mut json_object = ::core::ptr::null_mut::<json_object>();
45-
let mut entrykey: *mut lh_entry =
46-
(*(json_object_get_object(jso) as *mut lh_table)).head;
45+
let mut entrykey: *mut lh_entry = (*(json_object_get_object(jso) as
46+
*mut lh_table)).head;
4747
let mut entry_nextkey: *mut lh_entry = ::core::ptr::null_mut::<lh_entry>();
4848
while !({
4949
if !entrykey.is_null() {
5050
key = (*entrykey).k as uintptr_t as *mut ::core::ffi::c_void
5151
as *mut ::core::ffi::c_char;
52-
child = (*entrykey).v as uintptr_t as *mut ::core::ffi::c_void
53-
as *mut json_object;
52+
child =
53+
(*entrykey).v as uintptr_t as *mut ::core::ffi::c_void as *mut json_object;
5454
entry_nextkey = (*entrykey).next;
5555
}
5656
entrykey
@@ -68,17 +68,13 @@ unsafe extern "C" fn _json_c_visit(
6868
if userret == crate::src::json_visit::JSON_C_VISIT_RETURN_POP {
6969
break;
7070
}
71-
if userret == crate::src::json_visit::JSON_C_VISIT_RETURN_STOP
72-
|| userret == crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR
73-
{
71+
if userret == crate::src::json_visit::JSON_C_VISIT_RETURN_STOP || userret == crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR {
7472
return userret;
7573
}
76-
if userret != crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE
77-
&& userret != crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP
78-
{
74+
if userret != crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE && userret != crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP {
7975
fprintf(
8076
stderr,
81-
b"INTERNAL ERROR: _json_c_visit returned %d\\n\\0" as *const u8
77+
b"INTERNAL ERROR: _json_c_visit returned %d\\n\\0".as_ptr()
8278
as *const ::core::ffi::c_char,
8379
userret,
8480
);
@@ -105,17 +101,13 @@ unsafe extern "C" fn _json_c_visit(
105101
if userret == crate::src::json_visit::JSON_C_VISIT_RETURN_POP {
106102
break;
107103
}
108-
if userret == crate::src::json_visit::JSON_C_VISIT_RETURN_STOP
109-
|| userret == crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR
110-
{
104+
if userret == crate::src::json_visit::JSON_C_VISIT_RETURN_STOP || userret == crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR {
111105
return userret;
112106
}
113-
if userret != crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE
114-
&& userret != crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP
115-
{
107+
if userret != crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE && userret != crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP {
116108
fprintf(
117109
stderr,
118-
b"INTERNAL ERROR: _json_c_visit returned %d\\n\\0" as *const u8
110+
b"INTERNAL ERROR: _json_c_visit returned %d\\n\\0".as_ptr()
119111
as *const ::core::ffi::c_char,
120112
userret,
121113
);
@@ -127,7 +119,7 @@ unsafe extern "C" fn _json_c_visit(
127119
_ => {
128120
fprintf(
129121
stderr,
130-
b"INTERNAL ERROR: _json_c_visit found object of unknown type: %d\\n\\0" as *const u8
122+
b"INTERNAL ERROR: _json_c_visit found object of unknown type: %d\\n\\0".as_ptr()
131123
as *const ::core::ffi::c_char,
132124
json_object_get_type(jso) as ::core::ffi::c_uint,
133125
);
@@ -148,26 +140,26 @@ unsafe extern "C" fn _json_c_visit(
148140
userarg,
149141
);
150142
match userret {
151-
crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP
152-
| crate::src::json_visit::JSON_C_VISIT_RETURN_POP
153-
| crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE => {
154-
// These are not really sensible during JSON_C_VISIT_SECOND,
143+
crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP |
144+
crate::src::json_visit::JSON_C_VISIT_RETURN_POP |
145+
crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE => {
146+
// These are not really sensible during JSON_C_VISIT_SECOND,
155147
// but map them to JSON_C_VISIT_CONTINUE anyway.
156148
// FALLTHROUGH
157149
return crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE;
158150
}
159-
crate::src::json_visit::JSON_C_VISIT_RETURN_STOP
160-
| crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR => return userret,
151+
crate::src::json_visit::JSON_C_VISIT_RETURN_STOP |
152+
crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR => return userret,
161153
_ => {
162154
fprintf(
163155
stderr,
164-
b"ERROR: invalid return value from json_c_visit userfunc: %d\\n\\0" as *const u8
156+
b"ERROR: invalid return value from json_c_visit userfunc: %d\\n\\0".as_ptr()
165157
as *const ::core::ffi::c_char,
166158
userret,
167159
);
168160
return crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR;
169161
}
170-
};
162+
}
171163
// NOTREACHED
172164
}
173165
```"""
@@ -307,7 +299,7 @@ unsafe extern "C" fn _json_c_visit(
307299
_ => {
308300
fprintf(
309301
stderr,
310-
b"ERROR: invalid return value from json_c_visit userfunc: %d\\n\\0" as *const u8
302+
b"ERROR: invalid return value from json_c_visit userfunc: %d\\n\\0".as_ptr()
311303
as *const ::core::ffi::c_char,
312304
userret,
313305
);
@@ -351,7 +343,7 @@ unsafe extern "C" fn _json_c_visit(
351343
if userret != crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE && userret != crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP {
352344
fprintf(
353345
stderr,
354-
b"INTERNAL ERROR: _json_c_visit returned %d\\n\\0" as *const u8
346+
b"INTERNAL ERROR: _json_c_visit returned %d\\n\\0".as_ptr()
355347
as *const ::core::ffi::c_char,
356348
userret,
357349
);
@@ -384,7 +376,7 @@ unsafe extern "C" fn _json_c_visit(
384376
if userret != crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE && userret != crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP {
385377
fprintf(
386378
stderr,
387-
b"INTERNAL ERROR: _json_c_visit returned %d\\n\\0" as *const u8
379+
b"INTERNAL ERROR: _json_c_visit returned %d\\n\\0".as_ptr()
388380
as *const ::core::ffi::c_char,
389381
userret,
390382
);
@@ -396,7 +388,7 @@ unsafe extern "C" fn _json_c_visit(
396388
_ => {
397389
fprintf(
398390
stderr,
399-
b"INTERNAL ERROR: _json_c_visit found object of unknown type: %d\\n\\0" as *const u8
391+
b"INTERNAL ERROR: _json_c_visit found object of unknown type: %d\\n\\0".as_ptr()
400392
as *const ::core::ffi::c_char,
401393
json_object_get_type(jso) as ::core::ffi::c_uint,
402394
);
@@ -422,7 +414,7 @@ unsafe extern "C" fn _json_c_visit(
422414
_ => {
423415
fprintf(
424416
stderr,
425-
b"ERROR: invalid return value from json_c_visit userfunc: %d\\n\\0" as *const u8
417+
b"ERROR: invalid return value from json_c_visit userfunc: %d\\n\\0".as_ptr()
426418
as *const ::core::ffi::c_char,
427419
userret,
428420
);

c2rust-postprocess/tests/llm-cache/CommentTransfer/_json_c_visit/74372ced09d061616fb9dfc91f6f63ab6388eb2f6a682fee1630f82ee6936a07/response.txt renamed to c2rust-postprocess/tests/llm-cache/CommentTransfer/_json_c_visit/f533bfb5ea7ecc504f19c2942031e04d7104fb910f97bb59a927cd2d570b4dab/response.txt

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ unsafe extern "C" fn _json_c_visit(
1717
);
1818
match userret {
1919
crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE => {}
20-
crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP
21-
| crate::src::json_visit::JSON_C_VISIT_RETURN_POP
22-
| crate::src::json_visit::JSON_C_VISIT_RETURN_STOP
23-
| crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR => return userret,
20+
crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP |
21+
crate::src::json_visit::JSON_C_VISIT_RETURN_POP |
22+
crate::src::json_visit::JSON_C_VISIT_RETURN_STOP |
23+
crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR => return userret,
2424
_ => {
2525
fprintf(
2626
stderr,
27-
b"ERROR: invalid return value from json_c_visit userfunc: %d\n\0" as *const u8
27+
b"ERROR: invalid return value from json_c_visit userfunc: %d\n\0".as_ptr()
2828
as *const ::core::ffi::c_char,
2929
userret,
3030
);
@@ -39,15 +39,15 @@ unsafe extern "C" fn _json_c_visit(
3939
4 => {
4040
let mut key: *mut ::core::ffi::c_char = ::core::ptr::null_mut::<::core::ffi::c_char>();
4141
let mut child: *mut json_object = ::core::ptr::null_mut::<json_object>();
42-
let mut entrykey: *mut lh_entry =
43-
(*(json_object_get_object(jso) as *mut lh_table)).head;
42+
let mut entrykey: *mut lh_entry = (*(json_object_get_object(jso) as
43+
*mut lh_table)).head;
4444
let mut entry_nextkey: *mut lh_entry = ::core::ptr::null_mut::<lh_entry>();
4545
while !({
4646
if !entrykey.is_null() {
4747
key = (*entrykey).k as uintptr_t as *mut ::core::ffi::c_void
4848
as *mut ::core::ffi::c_char;
49-
child = (*entrykey).v as uintptr_t as *mut ::core::ffi::c_void
50-
as *mut json_object;
49+
child =
50+
(*entrykey).v as uintptr_t as *mut ::core::ffi::c_void as *mut json_object;
5151
entry_nextkey = (*entrykey).next;
5252
}
5353
entrykey
@@ -65,17 +65,13 @@ unsafe extern "C" fn _json_c_visit(
6565
if userret == crate::src::json_visit::JSON_C_VISIT_RETURN_POP {
6666
break;
6767
}
68-
if userret == crate::src::json_visit::JSON_C_VISIT_RETURN_STOP
69-
|| userret == crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR
70-
{
68+
if userret == crate::src::json_visit::JSON_C_VISIT_RETURN_STOP || userret == crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR {
7169
return userret;
7270
}
73-
if userret != crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE
74-
&& userret != crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP
75-
{
71+
if userret != crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE && userret != crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP {
7672
fprintf(
7773
stderr,
78-
b"INTERNAL ERROR: _json_c_visit returned %d\n\0" as *const u8
74+
b"INTERNAL ERROR: _json_c_visit returned %d\n\0".as_ptr()
7975
as *const ::core::ffi::c_char,
8076
userret,
8177
);
@@ -102,17 +98,13 @@ unsafe extern "C" fn _json_c_visit(
10298
if userret == crate::src::json_visit::JSON_C_VISIT_RETURN_POP {
10399
break;
104100
}
105-
if userret == crate::src::json_visit::JSON_C_VISIT_RETURN_STOP
106-
|| userret == crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR
107-
{
101+
if userret == crate::src::json_visit::JSON_C_VISIT_RETURN_STOP || userret == crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR {
108102
return userret;
109103
}
110-
if userret != crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE
111-
&& userret != crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP
112-
{
104+
if userret != crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE && userret != crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP {
113105
fprintf(
114106
stderr,
115-
b"INTERNAL ERROR: _json_c_visit returned %d\n\0" as *const u8
107+
b"INTERNAL ERROR: _json_c_visit returned %d\n\0".as_ptr()
116108
as *const ::core::ffi::c_char,
117109
userret,
118110
);
@@ -124,7 +116,7 @@ unsafe extern "C" fn _json_c_visit(
124116
_ => {
125117
fprintf(
126118
stderr,
127-
b"INTERNAL ERROR: _json_c_visit found object of unknown type: %d\n\0" as *const u8
119+
b"INTERNAL ERROR: _json_c_visit found object of unknown type: %d\n\0".as_ptr()
128120
as *const ::core::ffi::c_char,
129121
json_object_get_type(jso) as ::core::ffi::c_uint,
130122
);
@@ -145,26 +137,26 @@ unsafe extern "C" fn _json_c_visit(
145137
userarg,
146138
);
147139
match userret {
148-
crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP
149-
| crate::src::json_visit::JSON_C_VISIT_RETURN_POP
150-
| crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE => {
151-
// These are not really sensible during JSON_C_VISIT_SECOND,
140+
crate::src::json_visit::JSON_C_VISIT_RETURN_SKIP |
141+
crate::src::json_visit::JSON_C_VISIT_RETURN_POP |
142+
crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE => {
143+
// These are not really sensible during JSON_C_VISIT_SECOND,
152144
// but map them to JSON_C_VISIT_CONTINUE anyway.
153145
// FALLTHROUGH
154146
return crate::src::json_visit::JSON_C_VISIT_RETURN_CONTINUE;
155147
}
156-
crate::src::json_visit::JSON_C_VISIT_RETURN_STOP
157-
| crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR => return userret,
148+
crate::src::json_visit::JSON_C_VISIT_RETURN_STOP |
149+
crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR => return userret,
158150
_ => {
159151
fprintf(
160152
stderr,
161-
b"ERROR: invalid return value from json_c_visit userfunc: %d\n\0" as *const u8
153+
b"ERROR: invalid return value from json_c_visit userfunc: %d\n\0".as_ptr()
162154
as *const ::core::ffi::c_char,
163155
userret,
164156
);
165157
return crate::src::json_visit::JSON_C_VISIT_RETURN_ERROR;
166158
}
167-
};
159+
}
168160
// NOTREACHED
169161
}
170162
```

0 commit comments

Comments
 (0)