Skip to content

Rewrite .gitattributes CRLF ui tests into run-make tests #142925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Oneirical
Copy link
Contributor

@Oneirical Oneirical commented Jun 23, 2025

These tests are difficult to edit. Even adding a newline to the original UI test breaks it, as all newlines in them are supposed to be \r\n. (Except for trailing-carriage-return-in-string, which only has SOME CRLF)

In the run-make suite, the test is instead automatically generated with \r\n clearly visible, making fixes easier.

Closes #140033
Closes #139968

r? @jieyouxu

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 23, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 23, 2025

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

@Oneirical Oneirical force-pushed the unattentive-immobility branch 2 times, most recently from 4b34c01 to 1475a51 Compare June 23, 2025 19:25
@rust-log-analyzer

This comment has been minimized.

@Oneirical Oneirical force-pushed the unattentive-immobility branch from 1475a51 to 580b27c Compare June 23, 2025 22:14
@Oneirical Oneirical marked this pull request as ready for review June 23, 2025 22:16
@rustbot
Copy link
Collaborator

rustbot commented Jun 23, 2025

This PR modifies run-make tests.

cc @jieyouxu

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 23, 2025
@rust-log-analyzer

This comment has been minimized.

@jieyouxu
Copy link
Member

@rustbot author

@rustbot rustbot 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 Jun 24, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 24, 2025

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@Oneirical Oneirical force-pushed the unattentive-immobility branch from 580b27c to 12e1f3d Compare June 25, 2025 21:54
@Oneirical
Copy link
Contributor Author

@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 Jun 25, 2025
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.

Thanks, I do find having the BOM and \r\n immediately visible and possible to edit to be an important property.

@jieyouxu
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 26, 2025

📌 Commit 12e1f3d 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 Jun 26, 2025
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jun 26, 2025
…r=jieyouxu

Rewrite `.gitattributes` CRLF ui tests into run-make tests

These tests are difficult to edit. Even adding a newline to the original UI test breaks it, as all newlines in them are supposed to be `\r\n`. (Except for `trailing-carriage-return-in-string`,  which only has SOME CRLF)

In the run-make suite, the test is instead automatically generated with `\r\n` clearly visible, making fixes easier.

Closes rust-lang#140033
Closes rust-lang#139968

r? `@jieyouxu`
bors added a commit that referenced this pull request Jun 26, 2025
Rollup of 17 pull requests

Successful merges:

 - #124595 (Suggest cloning `Arc` moved into closure)
 - #139594 (Simplify `ObligationCauseCode::IfExpression`)
 - #141311 (make `tidy-alphabetical` use a natural sort)
 - #141648 ([rustdoc] Do not emit redundant_explicit_links lint if the doc comment comes from expansion)
 - #142255 (Add edition checks for some tests that had divergent output)
 - #142285 (tests: Do not run afoul of asm.validity.non-exhaustive in input-stats)
 - #142549 (small iter.intersperse.fold() optimization)
 - #142637 (Remove some glob imports from the type system)
 - #142647 ([perf] Compute hard errors without diagnostics in impl_intersection_has_impossible_obligation)
 - #142700 (Remove incorrect comments in `Weak`)
 - #142884 (StableMIR: Add method to retrieve body of coroutine)
 - #142925 (Rewrite `.gitattributes` CRLF ui tests into run-make tests)
 - #143001 (Rename run always )
 - #143010 (Update `browser-ui-test` version to `0.20.7`)
 - #143015 (Add `sym::macro_pin` diagnostic item for `core::pin::pin!()`)
 - #143020 (codegen_fn_attrs: make comment more precise)
 - #143033 (Expand const-stabilized API links in relnotes)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
5 participants