Skip to content

Conversation

jieyouxu
Copy link
Member

@jieyouxu jieyouxu commented Feb 2, 2025

Reference for overall changes: #136437
Part 1 of 7 of the compiletest-related cleanups PR series.

Summary

  • Don't match on path when we already have test suite names.
  • Remove a useless path join.

r? bootstrap (or compiler)

@rustbot

This comment was marked as off-topic.

@rustbot rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Feb 2, 2025
@jieyouxu jieyouxu changed the title [compiletest-related cleanups 1/9] cleanup is_rustdoc logic [compiletest-related cleanups 1/9] Cleanup is_rustdoc logic Feb 2, 2025
@jieyouxu jieyouxu changed the title [compiletest-related cleanups 1/9] Cleanup is_rustdoc logic [compiletest-related cleanups 1/8] Cleanup is_rustdoc logic Feb 2, 2025
@jieyouxu jieyouxu changed the title [compiletest-related cleanups 1/8] Cleanup is_rustdoc logic [compiletest-related cleanups 1/7] Cleanup is_rustdoc logic and remove a useless path join in rustdoc-json runtest logic Feb 2, 2025
@jieyouxu 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 Feb 2, 2025
Comment on lines -25 to +24
.arg(root.join(&out_dir))
.arg(&out_dir)
Copy link
Member Author

@jieyouxu jieyouxu Feb 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This currently is useless because out_dir is an absolute path, so root.join(&out_dir) will just become out_dir. This would be actually wrong if out_dir was a relative path, because build dir is not necessarily under source root (such as in CI).

@jieyouxu
Copy link
Member Author

jieyouxu commented Feb 2, 2025

@rustbot ready

@rustbot 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 Feb 2, 2025
@compiler-errors
Copy link
Member

r? compiler-errors @bors r+ rollup

@bors
Copy link
Collaborator

bors commented Feb 2, 2025

📌 Commit 4d0cb42 has been approved by compiler-errors

It is now in the queue for this repository.

@bors 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 Feb 2, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 3, 2025
Rollup of 8 pull requests

Successful merges:

 - rust-lang#136356 (Docs for f16 and f128: correct a typo and add details)
 - rust-lang#136404 (Remove a footgun-y feature / relic of the past from the compiletest DSL)
 - rust-lang#136432 (LTA: Actually check where-clauses for well-formedness at the def site)
 - rust-lang#136438 (miri: improve error when offset_from preconditions are violated)
 - rust-lang#136441 ([`compiletest`-related cleanups 1/7] Cleanup `is_rustdoc` logic and remove a useless path join in rustdoc-json runtest logic)
 - rust-lang#136455 (Remove some `Clone` bounds and derives.)
 - rust-lang#136464 (Remove hook calling via `TyCtxtAt`.)
 - rust-lang#136467 (override default config profile on tarballs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit bdc6b4d into rust-lang:master Feb 3, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Feb 3, 2025
@jieyouxu jieyouxu deleted the cleanup-is-rustdoc branch February 3, 2025 19:49
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 3, 2025
Rollup merge of rust-lang#136441 - jieyouxu:cleanup-is-rustdoc, r=compiler-errors

[`compiletest`-related cleanups 1/7] Cleanup `is_rustdoc` logic and remove a useless path join in rustdoc-json runtest logic

Reference for overall changes: rust-lang#136437
Part **1** of **7** of the *`compiletest`-related cleanups* PR series.

### Summary

- Don't match on path when we already have test suite names.
- Remove a useless path join.

r? bootstrap (or compiler)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants