move TestHelpers to test.rs and rename native.rs to llvm.rs

[jkvargas]

Fixes issse #108240

[rustbot]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) soon.

Please see the contribution instructions for more information.

[bors]

☔ The latest upstream changes (presumably #108302) made this pull request unmergeable. Please resolve the merge conflicts.

[Mark-Simulacrum]

Please squash commits. r=me with that done.

@rustbot author

[Mark-Simulacrum]

Please squash commits. r=me with that done.

@rustbot author

[bors]

☔ The latest upstream changes (presumably #107879) made this pull request unmergeable. Please resolve the merge conflicts.

[rust-log-analyzer]

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

   Compiling xz2 v0.1.6
error[E0422]: cannot find struct, variant or union type `TestHelpers` in this scope
    --> test.rs:1438:24
     |
1438 |         builder.ensure(TestHelpers { target: compiler.host });

error[E0422]: cannot find struct, variant or union type `TestHelpers` in this scope
    --> test.rs:1442:28
     |
---
  --> lib.rs:63:1
   |
63 | mod test;
   | ^^^^^^^^^
   = note: `-D unused-imports` implied by `-D warnings`
For more information about this error, try `rustc --explain E0422`.
error: could not compile `bootstrap` due to 3 previous errors
failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
Build completed unsuccessfully in 0:00:20
Build completed unsuccessfully in 0:00:20
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 2/5:
Building bootstrap
   Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
error[E0422]: cannot find struct, variant or union type `TestHelpers` in this scope
    --> test.rs:1438:24
     |
1438 |         builder.ensure(TestHelpers { target: compiler.host });

error[E0422]: cannot find struct, variant or union type `TestHelpers` in this scope
    --> test.rs:1442:28
     |
---
  --> lib.rs:63:1
   |
63 | mod test;
   | ^^^^^^^^^
   = note: `-D unused-imports` implied by `-D warnings`
For more information about this error, try `rustc --explain E0422`.
error: could not compile `bootstrap` due to 3 previous errors
failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
Build completed unsuccessfully in 0:00:01
Build completed unsuccessfully in 0:00:01
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 3/5:
Building bootstrap
   Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
error[E0422]: cannot find struct, variant or union type `TestHelpers` in this scope
    --> test.rs:1438:24
     |
1438 |         builder.ensure(TestHelpers { target: compiler.host });

error[E0422]: cannot find struct, variant or union type `TestHelpers` in this scope
    --> test.rs:1442:28
     |
---
  --> lib.rs:63:1
   |
63 | mod test;
   | ^^^^^^^^^
   = note: `-D unused-imports` implied by `-D warnings`
For more information about this error, try `rustc --explain E0422`.
error: could not compile `bootstrap` due to 3 previous errors
failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
Build completed unsuccessfully in 0:00:01
Build completed unsuccessfully in 0:00:01
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 4/5:
Building bootstrap
   Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
error[E0422]: cannot find struct, variant or union type `TestHelpers` in this scope
    --> test.rs:1438:24
     |
1438 |         builder.ensure(TestHelpers { target: compiler.host });

error[E0422]: cannot find struct, variant or union type `TestHelpers` in this scope
    --> test.rs:1442:28
     |
---
  --> lib.rs:63:1
   |
63 | mod test;
   | ^^^^^^^^^
   = note: `-D unused-imports` implied by `-D warnings`
For more information about this error, try `rustc --explain E0422`.
error: could not compile `bootstrap` due to 3 previous errors
failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
Build completed unsuccessfully in 0:00:01
Build completed unsuccessfully in 0:00:01
make: *** [Makefile:58: prepare] Error 1
Command failed. Attempt 5/5:
Building bootstrap
   Compiling bootstrap v0.0.0 (/checkout/src/bootstrap)
error[E0422]: cannot find struct, variant or union type `TestHelpers` in this scope
    --> test.rs:1438:24
     |
1438 |         builder.ensure(TestHelpers { target: compiler.host });

error[E0422]: cannot find struct, variant or union type `TestHelpers` in this scope
    --> test.rs:1442:28
     |
---
  --> lib.rs:63:1
   |
63 | mod test;
   | ^^^^^^^^^
   = note: `-D unused-imports` implied by `-D warnings`
For more information about this error, try `rustc --explain E0422`.
error: could not compile `bootstrap` due to 3 previous errors
failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
Build completed unsuccessfully in 0:00:01

[jkvargas]

Closing this since I created a new PR #109649