I've added a test for the total order, based on a reduced test case from the issue (apparently creduce can reduce any text file).
I've also included your code suggestions.

Not sure what my IDE did to the imports but I'll fix it, I'll also fix your other suggestions. But it will have to wait until after the weekend

Not sure what my IDE did to the imports but I'll fix it, I'll also fix your other suggestions. But it will have to wait until after the weekend

No problem, no rush.

@kkysen I've included your suggestions. Is there anything else that needs to change?

Added your last suggestion

CI seems to be failing, only on Darwin, for some reason:

CI

/Users/runner/work/1/s/tests/statics/src/thread_locals.c:4:17: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
static __thread gsti = 37;
~~~~~~~~~~~~~~~ ^
int
/Users/runner/work/1/s/tests/statics/src/thread_locals.c:5:17: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
extern __thread geti;
~~~~~~~~~~~~~~~ ^
int
/Users/runner/work/1/s/tests/statics/src/thread_locals.c:12:21: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
    static __thread fsti = 59;
    ~~~~~~~~~~~~~~~ ^
    int
/Users/runner/work/1/s/tests/statics/src/thread_locals.c:13:21: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int]
    extern __thread feti;
    ~~~~~~~~~~~~~~~ ^
    int

This doesn't seem to be related to the changes, here, though, so I'm not sure what's happening.

Maybe the darwin image got updated or something? I really don't see how this change can cause this

Could you try triggering the CI on the last commit in master? See if it has the same failure

@kkysen with your CI fix from yesterday, this PR is now green again.

@kkysen with your CI fix from yesterday, this PR is now green again.

Awesome! I'll merge this now. Sorry for the delay with the CI, and thanks for fixing this!

Oops, I'm now getting a different CI error in the CI workflow that won't run on outside contributors' PRs correctly: https://github.com/immunant/c2rust/actions/runs/11493361902/job/31988919249. Do you have an idea of what this might be? Sorry this CI workflow still isn't set up to correctly run on external PRs.

Maybe a path confusion? If you look at the first error:

error[E0422]: cannot find struct, variant or union type `C2RustUnnamed_4` in this scope
    --> src/lib/conncache.rs:3264:38
     |
3264 |                 __sigaction_handler: C2RustUnnamed_4 {
     |                                      ^^^^^^^^^^^^^^^ not found in this scope
     |
help: consider importing one of these items
     |
3293 |     use crate::src::lib::conncache::C2RustUnnamed_4;
     |
       and 28 other candidates

It seems that C2RustUnnamed_4 is put in src/src/lib/conncache.rs instead of src/lib/conncache.rs and therefore requiring an import. But I haven't looked into c2rust-testsuite enough to understand what it's doing.