compiletest: tidy up how tidy and tidy (html version) are disambiguated#131961
Merged
bors merged 1 commit intorust-lang:masterfrom Oct 20, 2024
Merged
compiletest: tidy up how tidy and tidy (html version) are disambiguated#131961bors merged 1 commit intorust-lang:masterfrom
tidy and tidy (html version) are disambiguated#131961bors merged 1 commit intorust-lang:masterfrom
Conversation
Zalathar
reviewed
Oct 20, 2024
src/tools/compiletest/src/main.rs
Outdated
|
|
||
| if !config.has_tidy && config.mode == Mode::Rustdoc { | ||
| if !config.has_html_tidy && config.mode == Mode::Rustdoc { | ||
| eprintln!("warning: `tidy` is not installed; diffs will not be generated"); |
Member
There was a problem hiding this comment.
Nit: Maybe disambiguate this warning as well?
Member
Author
There was a problem hiding this comment.
This is why this PR is a follow-up heh, because #131941 is fixing the warning, which is why I noticed and am sending this follow-up.
Member
There was a problem hiding this comment.
Ah, the original hasn’t landed yet, I see. I guess you’ll want to rebase this afterwards.
Member
|
Thanks for tidying. Feel free to r=me after the previous PR lands. |
jieyouxu
commented
Oct 20, 2024
| @@ -1,5 +1,3 @@ | |||
| // ignore-tidy-filelength | |||
Member
Author
There was a problem hiding this comment.
This was originally just me being curious, but since tidy likes it I'm just going to keep this change in and delete this.
Member
Author
Member
Author
|
@rustbot ready |
Member
Author
Collaborator
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Oct 20, 2024
compiletest: tidy up how `tidy` and `tidy` (html version) are disambiguated Rename `has_tidy` -> `has_html_tidy` (`tidy` is also a bootstrap tool, but rustdoc uses a html tidy that has the same binary name). Follow-up to rust-lang#131941. Also apparently `runtest.rs` is short enough now, we can delete the `tidy` (bootstrap version) ignore for file length.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 20, 2024
…iaskrgr Rollup of 3 pull requests Successful merges: - rust-lang#131926 (Align boolean option descriptions in `configure.py`) - rust-lang#131961 (compiletest: tidy up how `tidy` and `tidy` (html version) are disambiguated) - rust-lang#131962 (Make `llvm::set_section` take a `&CStr`) Failed merges: - rust-lang#131181 (Compiletest: Custom differ) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 20, 2024
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#121560 (Allow `#[deny]` inside `#[forbid]` as a no-op) - rust-lang#131365 (Fix missing rustfmt in msi installer rust-lang#101993) - rust-lang#131647 (Register `src/tools/unicode-table-generator` as a runnable tool) - rust-lang#131843 (compiler: Error on layout of enums with invalid reprs) - rust-lang#131926 (Align boolean option descriptions in `configure.py`) - rust-lang#131961 (compiletest: tidy up how `tidy` and `tidy` (html version) are disambiguated) - rust-lang#131962 (Make `llvm::set_section` take a `&CStr`) - rust-lang#131964 (add latest crash tests) - rust-lang#131965 (remove outdated comment) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 20, 2024
Rollup merge of rust-lang#131961 - jieyouxu:dirty, r=Zalathar compiletest: tidy up how `tidy` and `tidy` (html version) are disambiguated Rename `has_tidy` -> `has_html_tidy` (`tidy` is also a bootstrap tool, but rustdoc uses a html tidy that has the same binary name). Follow-up to rust-lang#131941. Also apparently `runtest.rs` is short enough now, we can delete the `tidy` (bootstrap version) ignore for file length.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Rename
has_tidy->has_html_tidy(tidyis also a bootstrap tool, but rustdoc uses a html tidy that has the same binary name). Follow-up to #131941.Also apparently
runtest.rsis short enough now, we can delete thetidy(bootstrap version) ignore for file length.