Advent of `tests/ui` (misc cleanups and improvements) [3/N] #134418

jieyouxu · 2024-12-17T11:51:01Z

Misc improvements to some ui tests immediately under tests/ui/.

Best reviewed commit-by-commit. Each commit's commit message contains further elaboration and rationale for changes.

r? compiler

- Move `tests/ui/attr-bad-crate-attr.rs` to `tests/ui/attributes/`. - Briefly document test intent add link to relevant Reference docs.

- Move `tests/ui/attr-shebang.rs` to `tests/ui/attributes/`. - Downgrade test to `check-pass`, this would fail very early if the parser did not accept `#![..]` attributes. - Briefly document test intent.

tests/ui/attributes/inline/attr-usage-inline.rs

- Move `tests/ui/attr-usage-inline.rs` to `tests/ui/attributes/inline/`. - Briefly document test intent. - Drop unnecessary `#[allow(dead_code)]` as this is allowed-by-default for ui test suite.

- Move `tests/ui/attrs-resolution-errors.rs` to `tests/ui/resolve/`. - Document test intent. - Rename test to `attr-macros-positional-rejection.rs` to better reflect test intent.

- Move `tests/ui/attrs-resolution.rs` to `tests/ui/resolve/`. - Document test intent. - Rename test to `non-macro-attrs-accepted.rs` to better reflect test intent.

jieyouxu · 2024-12-17T11:59:49Z

Probably should group tests/ui/{attrs-resolution-errors,attrs-resolutions}.rs together, naming suggestions / organization advice welcomed.

Note that I didn't use differential revisions for these two tests and merge them into one because

#[cfg_attr(rev_name, non_macro_attr)]

is IMO significantly different from

#[non_macro_attr]

rust-log-analyzer · 2024-12-17T12:50:21Z

The job x86_64-gnu-llvm-18 failed! Check out the build log: (web) (plain)

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

#20 exporting to docker image format
#20 sending tarball 28.0s done
#20 DONE 41.6s
##[endgroup]
Setting extra environment values for docker:  --env ENABLE_GCC_CODEGEN=1 --env GCC_EXEC_PREFIX=/usr/lib/gcc/
[CI_JOB_NAME=x86_64-gnu-llvm-18]
debug: `DISABLE_CI_RUSTC_IF_INCOMPATIBLE` configured.
---
sccache: Starting the server...
##[group]Configure the build
configure: processing command line
configure: 
configure: build.configure-args := ['--build=x86_64-unknown-linux-gnu', '--llvm-root=/usr/lib/llvm-18', '--enable-llvm-link-shared', '--set', 'rust.randomize-layout=true', '--set', 'rust.thin-lto-import-instr-limit=10', '--enable-verbose-configure', '--enable-sccache', '--disable-manage-submodules', '--enable-locked-deps', '--enable-cargo-native-static', '--set', 'rust.codegen-units-std=1', '--set', 'dist.compression-profile=balanced', '--dist-compression-formats=xz', '--set', 'rust.lld=false', '--disable-dist-src', '--release-channel=nightly', '--enable-debug-assertions', '--enable-overflow-checks', '--enable-llvm-assertions', '--set', 'rust.verify-llvm-ir', '--set', 'rust.codegen-backends=llvm,cranelift,gcc', '--set', 'llvm.static-libstdcpp', '--enable-new-symbol-mangling']
configure: target.x86_64-unknown-linux-gnu.llvm-config := /usr/lib/llvm-18/bin/llvm-config
configure: llvm.link-shared     := True
configure: rust.randomize-layout := True
configure: rust.thin-lto-import-instr-limit := 10
---
  Downloaded boml v0.3.1
   Compiling boml v0.3.1
   Compiling y v0.1.0 (/checkout/compiler/rustc_codegen_gcc/build_system)
    Finished `release` profile [optimized] target(s) in 3.90s
     Running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-codegen/x86_64-unknown-linux-gnu/release/y test --use-system-gcc --use-backend gcc --out-dir /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/cg_gcc --release --mini-tests --std-tests`
Using system GCC
[BUILD] example
[AOT] mini_core_hello_world
/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/cg_gcc/mini_core_hello_world
abc

jieyouxu · 2024-12-17T12:54:41Z

... Blocked on making the bootstrap test not use a random ui test in #134423.
@rustbot blocked

…nur-ozkan bootstrap: use specific-purpose ui test path for `test_valid` self-test I wanted to move some ui tests around in rust-lang#134418, which broke `test_valid` since it was referencing two non-specific-purpose ui tests. This PR instead adds two dummy tests under `tests/ui/bootstrap/self-test/`, for that purpose specifically. r? bootstrap

jieyouxu · 2024-12-18T09:36:40Z

Unblocked as #134423 merged.

jieyouxu · 2024-12-18T10:46:43Z

@rustbot ready

compiler-errors · 2024-12-18T16:57:05Z

@bors r+ rollup

bors · 2024-12-18T16:57:08Z

📌 Commit 47ad3b2 has been approved by compiler-errors

It is now in the queue for this repository.

…errors Advent of `tests/ui` (misc cleanups and improvements) [3/N] Part of rust-lang#133895. Misc improvements to some ui tests immediately under `tests/ui/`. Best reviewed commit-by-commit. Each commit's commit message contains further elaboration and rationale for changes. r? compiler

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#132056 (Stabilize `#[diagnostic::do_not_recommend]`) - rust-lang#133643 (-Znext-solver: modify candidate preference rules) - rust-lang#134418 (Advent of `tests/ui` (misc cleanups and improvements) [3/N]) - rust-lang#134432 (Fix intra doc links not generated inside footnote definitions) - rust-lang#134473 (chore: fix some typos) - rust-lang#134474 (Forbid overwriting types in typeck) - rust-lang#134477 (move lint_unused_mut into sub-fn) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 8 pull requests Successful merges: - rust-lang#132056 (Stabilize `#[diagnostic::do_not_recommend]`) - rust-lang#133643 (-Znext-solver: modify candidate preference rules) - rust-lang#134388 (Update books) - rust-lang#134418 (Advent of `tests/ui` (misc cleanups and improvements) [3/N]) - rust-lang#134473 (chore: fix some typos) - rust-lang#134481 (Point at lint name instead of whole attr for gated lints) - rust-lang#134484 (Add nnethercote to the `triagebot.toml` vacation list.) - rust-lang#134490 (Fix typo in ptr/mod.rs) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#134418 - jieyouxu:ui-cleanup-3, r=compiler-errors Advent of `tests/ui` (misc cleanups and improvements) [3/N] Part of rust-lang#133895. Misc improvements to some ui tests immediately under `tests/ui/`. Best reviewed commit-by-commit. Each commit's commit message contains further elaboration and rationale for changes. r? compiler

jieyouxu added 4 commits December 17, 2024 19:09

Move tests/ui/associated-path-shl.rs to tests/ui/parser/

30f5a03

Move tests/ui/attempted-access-non-fatal.rs to tests/ui/typeck/

4ca2d9f

Adjust tests/ui/attr-bad-crate-attr.rs

0fc6be7

- Move `tests/ui/attr-bad-crate-attr.rs` to `tests/ui/attributes/`. - Briefly document test intent add link to relevant Reference docs.

Adjust tests/ui/attr-shebang.rs

88f8bf7

- Move `tests/ui/attr-shebang.rs` to `tests/ui/attributes/`. - Downgrade test to `check-pass`, this would fail very early if the parser did not accept `#![..]` attributes. - Briefly document test intent.

rustbot assigned estebank Dec 17, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 17, 2024

jieyouxu mentioned this pull request Dec 17, 2024

Tracking Issue for ui test suite improvements #133895

Open

jieyouxu commented Dec 17, 2024

View reviewed changes

tests/ui/attributes/inline/attr-usage-inline.rs Outdated Show resolved Hide resolved

jieyouxu added 3 commits December 17, 2024 19:57

Adjust tests/ui/attr-usage-inline.rs

7424b89

- Move `tests/ui/attr-usage-inline.rs` to `tests/ui/attributes/inline/`. - Briefly document test intent. - Drop unnecessary `#[allow(dead_code)]` as this is allowed-by-default for ui test suite.

Adjust tests/ui/attrs-resolution-errors.rs

836a0e0

- Move `tests/ui/attrs-resolution-errors.rs` to `tests/ui/resolve/`. - Document test intent. - Rename test to `attr-macros-positional-rejection.rs` to better reflect test intent.

Adjust tests/ui/attrs-resolution.rs

47ad3b2

- Move `tests/ui/attrs-resolution.rs` to `tests/ui/resolve/`. - Document test intent. - Rename test to `non-macro-attrs-accepted.rs` to better reflect test intent.

jieyouxu force-pushed the ui-cleanup-3 branch from 07f7745 to 47ad3b2 Compare December 17, 2024 11:57

jieyouxu added the A-testsuite Area: The testsuite used to check the correctness of rustc label Dec 17, 2024

jieyouxu added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 17, 2024

rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 17, 2024

jieyouxu mentioned this pull request Dec 17, 2024

bootstrap: use specific-purpose ui test path for test_valid self-test #134423

Merged

jieyouxu closed this Dec 18, 2024

jieyouxu reopened this Dec 18, 2024

jieyouxu added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Dec 18, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 18, 2024

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 18, 2024

compiler-errors assigned compiler-errors and unassigned estebank Dec 18, 2024

matthiaskrgr mentioned this pull request Dec 18, 2024

Rollup of 7 pull requests #134480

Closed

jhpratt mentioned this pull request Dec 19, 2024

Rollup of 8 pull requests #134492

Merged

bors merged commit 871c2d8 into rust-lang:master Dec 19, 2024
10 of 12 checks passed

rustbot added this to the 1.85.0 milestone Dec 19, 2024

jieyouxu deleted the ui-cleanup-3 branch December 19, 2024 08:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Advent of `tests/ui` (misc cleanups and improvements) [3/N] #134418

Advent of `tests/ui` (misc cleanups and improvements) [3/N] #134418

jieyouxu commented Dec 17, 2024

jieyouxu commented Dec 17, 2024 •

edited

Loading

rust-log-analyzer commented Dec 17, 2024

jieyouxu commented Dec 17, 2024 •

edited

Loading

jieyouxu commented Dec 18, 2024

jieyouxu commented Dec 18, 2024

compiler-errors commented Dec 18, 2024

bors commented Dec 18, 2024

Advent of tests/ui (misc cleanups and improvements) [3/N] #134418

Advent of tests/ui (misc cleanups and improvements) [3/N] #134418

Conversation

jieyouxu commented Dec 17, 2024

jieyouxu commented Dec 17, 2024 • edited Loading

rust-log-analyzer commented Dec 17, 2024

jieyouxu commented Dec 17, 2024 • edited Loading

jieyouxu commented Dec 18, 2024

jieyouxu commented Dec 18, 2024

compiler-errors commented Dec 18, 2024

bors commented Dec 18, 2024

Advent of `tests/ui` (misc cleanups and improvements) [3/N] #134418

Advent of `tests/ui` (misc cleanups and improvements) [3/N] #134418

jieyouxu commented Dec 17, 2024 •

edited

Loading

jieyouxu commented Dec 17, 2024 •

edited

Loading