rust icon indicating copy to clipboard operation
rust copied to clipboard

`tests/ui`: A New Order [11/N]

Open Kivooeo opened this issue 6 months ago • 3 comments

[!NOTE]

Intermediate commits are intended to help review, but will be squashed prior to merge.

Some tests/ui/ housekeeping, to trim down number of tests directly under tests/ui/. Part of rust-lang/rust#133895.

r? @jieyouxu

Kivooeo avatar Jun 08 '25 21:06 Kivooeo

jieyouxu is not on the review rotation at the moment. They may take a while to respond.

rustbot avatar Jun 08 '25 21:06 rustbot

The job aarch64-gnu-llvm-19-1 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
17    |             ^^^^^^^^^^^^^^^^^^^^^^^^
-    |
- help: there is a file with the same name in a different directory
-    |
- LL |     let _ = include_str!("../hello.rs");
-    |                           +++
23 
24 error: couldn't read `$DIR/../../data.bin`: $FILE_NOT_FOUND_MSG
25   --> $DIR/parent_dir.rs:8:13


The actual stderr differed from the expected stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args include-macros/parent_dir.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/include-macros/parent_dir.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2" "--target=aarch64-unknown-linux-gnu" "--check-cfg" "cfg(test,FALSE)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/include-macros/parent_dir" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers"
stdout: none
--- stderr -------------------------------
error: couldn't read `/checkout/tests/ui/include-macros/include-macros/file.txt`: No such file or directory (os error 2)
##[error]  --> /checkout/tests/ui/include-macros/parent_dir.rs:4:13
   |
LL |     let _ = include_str!("include-macros/file.txt");            //~ ERROR couldn't read
   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
help: there is a file with the same name in a different directory
   |
LL -     let _ = include_str!("include-macros/file.txt");            //~ ERROR couldn't read
LL +     let _ = include_str!("file.txt");            //~ ERROR couldn't read
   |

error: couldn't read `/checkout/tests/ui/include-macros/hello.rs`: No such file or directory (os error 2)
##[error]  --> /checkout/tests/ui/include-macros/parent_dir.rs:6:13
   |
LL |     let _ = include_str!("hello.rs");                           //~ ERROR couldn't read
   |             ^^^^^^^^^^^^^^^^^^^^^^^^

error: couldn't read `/checkout/tests/ui/include-macros/../../data.bin`: No such file or directory (os error 2)
##[error]  --> /checkout/tests/ui/include-macros/parent_dir.rs:8:13
   |
LL |     let _ = include_bytes!("../../data.bin");                   //~ ERROR couldn't read
   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
help: there is a file with the same name in a different directory
   |
LL -     let _ = include_bytes!("../../data.bin");                   //~ ERROR couldn't read
LL +     let _ = include_bytes!("data.bin");                   //~ ERROR couldn't read
   |

error: couldn't read `/checkout/tests/ui/include-macros/tests/ui/include-macros/file.txt`: No such file or directory (os error 2)
##[error]  --> /checkout/tests/ui/include-macros/parent_dir.rs:10:13
   |
LL |     let _ = include_str!("tests/ui/include-macros/file.txt");   //~ ERROR couldn't read
   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
help: there is a file with the same name in a different directory
   |
LL -     let _ = include_str!("tests/ui/include-macros/file.txt");   //~ ERROR couldn't read
LL +     let _ = include_str!("file.txt");   //~ ERROR couldn't read
   |

error: aborting due to 4 previous errors
------------------------------------------

---
To only update this specific test, also pass `--test-args lint/future-incompatible-lint-group.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/lint/future-incompatible-lint-group.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2" "--target=aarch64-unknown-linux-gnu" "--check-cfg" "cfg(test,FALSE)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/lint/future-incompatible-lint-group" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers"
stdout: none
--- stderr -------------------------------
error: missing fragment specifier
##[error]  --> /checkout/tests/ui/lint/future-incompatible-lint-group.rs:9:6
   |
LL |     ($i) => {};
   |      ^^
   |
   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
   = note: for more information, see issue #40107 <https://github.com/rust-lang/rust/issues/40107>
note: the lint level is defined here
  --> /checkout/tests/ui/lint/future-incompatible-lint-group.rs:5:9
   |
LL | #![deny(future_incompatible)]
   |         ^^^^^^^^^^^^^^^^^^^
   = note: `#[deny(missing_fragment_specifier)]` implied by `#[deny(future_incompatible)]`

warning: anonymous parameters are deprecated and will be removed in the next edition
##[warning]  --> /checkout/tests/ui/lint/future-incompatible-lint-group.rs:16:10
   |
LL |     fn f(u8) {}
---
Future incompatibility report: Future breakage diagnostic:
error: missing fragment specifier
##[error]  --> /checkout/tests/ui/lint/future-incompatible-lint-group.rs:9:6
   |
LL |     ($i) => {};
   |      ^^
   |
   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
   = note: for more information, see issue #40107 <https://github.com/rust-lang/rust/issues/40107>
note: the lint level is defined here
  --> /checkout/tests/ui/lint/future-incompatible-lint-group.rs:5:9
   |
LL | #![deny(future_incompatible)]
   |         ^^^^^^^^^^^^^^^^^^^
   = note: `#[deny(missing_fragment_specifier)]` implied by `#[deny(future_incompatible)]`
------------------------------------------



failures:

rust-log-analyzer avatar Jun 08 '25 22:06 rust-log-analyzer

Looking at compiletest atm. r? compiler

jieyouxu avatar Jun 10 '25 10:06 jieyouxu

@bors r+ rollup

wesleywiser avatar Jun 11 '25 15:06 wesleywiser

:pushpin: Commit cd77403628dd9c0ab4d588cfb645b1233efa7d99 has been approved by wesleywiser

It is now in the queue for this repository.

bors avatar Jun 11 '25 15:06 bors

@wesleywiser could i also ask you to review this two, when you will have free time for it

https://github.com/rust-lang/rust/pull/142200

https://github.com/rust-lang/rust/pull/142214

it feels like davidtwco is busy irl (based on his last activity) or working on something different and will have no time to check this out

Kivooeo avatar Jun 11 '25 15:06 Kivooeo

Can you please squash the commits? @bors r-

jieyouxu avatar Jun 11 '25 15:06 jieyouxu

sure, give me a second

Kivooeo avatar Jun 11 '25 15:06 Kivooeo

I'll look at the other two PRs

jieyouxu avatar Jun 11 '25 15:06 jieyouxu

ready

Kivooeo avatar Jun 11 '25 15:06 Kivooeo

Thanks @bors r=wesleywiser

jieyouxu avatar Jun 11 '25 15:06 jieyouxu

:pushpin: Commit c6c55cc0cb63667833c54c13ad4a2eb576d48e13 has been approved by wesleywiser

It is now in the queue for this repository.

bors avatar Jun 11 '25 15:06 bors