Skip to content

Conversation

Zalathar
Copy link
Contributor

@Zalathar Zalathar commented Oct 12, 2024

This special handling of ignore-tidy* was introduced during the migration to //@ directives (#120881), and has become unnecessary after the subsequent removal of the legacy directive check (#131392).

@rustbot
Copy link
Collaborator

rustbot commented Oct 12, 2024

r? @wesleywiser

rustbot has assigned @wesleywiser.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot
Copy link
Collaborator

rustbot commented Oct 12, 2024

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@rustbot rustbot added 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 Oct 12, 2024
@Zalathar

This comment was marked as outdated.

@Zalathar
Copy link
Contributor Author

r? jieyouxu

@rustbot rustbot assigned jieyouxu and unassigned wesleywiser Oct 12, 2024
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Oh yeah good catch. Thanks!

@jieyouxu
Copy link
Member

You can r=me after PR CI is green.

@Zalathar
Copy link
Contributor Author

🟩

@bors r=jieyouxu rollup

@bors
Copy link
Collaborator

bors commented Oct 12, 2024

📌 Commit 3d15d2d has been approved by jieyouxu

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 Oct 12, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 12, 2024
compiletest: Remove the one thing that was checking a directive's `original_line`

This special handling of `ignore-tidy*` was introduced during the migration to `//`@`` directives (rust-lang#120881), and has become unnecessary after the subsequent removal of the legacy directive check (rust-lang#131392).
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 12, 2024
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#130870 (Add suggestion for removing invalid path sep `::` in fn def)
 - rust-lang#131233 (std: fix stdout-before-main)
 - rust-lang#131239 (Don't assume traits used as type are trait objs in 2021 edition)
 - rust-lang#131277 (Handle `clippy` cases of `rustc::potential_query_instability` lint)
 - rust-lang#131567 (Emit an error for unstable attributes that reference already stable features)
 - rust-lang#131585 (compiletest: Remove the one thing that was checking a directive's `original_line`)
 - rust-lang#131590 (yeet some clones)
 - rust-lang#131597 (Take a display name for `tool_check_step!`)

r? `@ghost`
`@rustbot` modify labels: rollup
@tgross35
Copy link
Contributor

tgross35 commented Oct 12, 2024

Looks like this failed the rollup #131601 (comment)

@bors r-

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 12, 2024
@jieyouxu
Copy link
Member

Ah of course, ./x doc src/tools/compiletest is run very late into full CI pipeline...

@tgross35
Copy link
Contributor

That does seem like the sort of thing that could be checked somewhere in PR CI

@jieyouxu
Copy link
Member

That does seem like the sort of thing that could be checked somewhere in PR CI

#131613

@Zalathar
Copy link
Contributor Author

Rebased and fixed trivial doc issue (diff).

I'm running a side job to double-check that there are no more problems, after which I'll reapply the r+.

@Zalathar
Copy link
Contributor Author

@bors r=jieyouxu

@bors
Copy link
Collaborator

bors commented Oct 13, 2024

📌 Commit f510880 has been approved by jieyouxu

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 13, 2024
@jieyouxu jieyouxu added the A-compiletest Area: The compiletest test runner label Oct 13, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 13, 2024
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#131086 (Update unicode-width to 0.2.0)
 - rust-lang#131585 (compiletest: Remove the one thing that was checking a directive's `original_line`)
 - rust-lang#131614 (Error on trying to use revisions in `run-make` tests)
 - rust-lang#131638 (compiletest: Move debugger setup code out of `lib.rs`)
 - rust-lang#131641 (switch unicode-data bitsets back to 'static')
 - rust-lang#131642 (Special case error message for a `build-fail` test that failed check build)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6e1488b into rust-lang:master Oct 13, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 13, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 13, 2024
Rollup merge of rust-lang#131585 - Zalathar:original-line, r=jieyouxu

compiletest: Remove the one thing that was checking a directive's `original_line`

This special handling of `ignore-tidy*` was introduced during the migration to `//`@`` directives (rust-lang#120881), and has become unnecessary after the subsequent removal of the legacy directive check (rust-lang#131392).
@Zalathar Zalathar deleted the original-line branch October 13, 2024 22:11
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
No open projects
Development

Successfully merging this pull request may close these issues.

6 participants