Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Format some tests #125759

Merged
merged 11 commits into from
May 31, 2024
Merged

Format some tests #125759

merged 11 commits into from
May 31, 2024

Conversation

nnethercote
Copy link
Contributor

There are more directories under tests/ still to do, but this is enough for one PR.

r? @GuillaumeGomez

@nnethercote
List all tests/ subdirs explicitly in rustfmt.toml.
4af4ba2 
So we can gradually remove the ones where rustfmt can be used.
@nnethercote
Run rustfmt on tests/assembly/.
d063c7b
@nnethercote
Run rustfmt on tests/auxiliary/.
b1b18e6 
That directory doesn't contain any Rust files, so it's a trivial change.
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 30, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 30, 2024

Some changes occurred in tests/codegen/stack-probes-inline.rs

cc @rust-lang/project-exploit-mitigations, @rcvalle

Some changes occurred in tests/codegen/sanitizer

cc @rust-lang/project-exploit-mitigations, @rcvalle

Some changes occurred in run-make tests.

cc @jieyouxu

Some changes occurred in tests/codegen/split-lto-unit.rs

cc @rust-lang/project-exploit-mitigations, @rcvalle

@nnethercote
Copy link
Contributor Author

This touches a lot of files and is conflict prone, so:

@bors rollup=never p=1

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
Copy link
Member

r=me once it's ready for you (and yeay, thanks a lot!).

@nnethercote
Copy link
Contributor Author

@bors r=GuillaumeGomez

@bors
Copy link
Contributor

bors commented May 30, 2024

📌 Commit d282f62 has been approved by GuillaumeGomez

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 May 30, 2024
@fmease
Copy link
Member

fmease commented May 30, 2024

I don't want my rollup of 4 to jump ahead of this PR (that'd be kinda mean ^^).
@bors p=5

bors added a commit to rust-lang-ci/rust that referenced this pull request May 31, 2024
@bors
Auto merge of rust-lang#125759 - nnethercote:format-some-tests, r=Gui…
d7a8f2e 
…llaumeGomez

Format some tests

There are more directories under `tests/` still to do, but this is enough for one PR.

r? `@GuillaumeGomez`
@bors
Copy link
Contributor

bors commented May 31, 2024

⌛ Testing commit d282f62 with merge d7a8f2e...

@bors
Copy link
Contributor

bors commented May 31, 2024

💔 Test failed - checks-actions

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

This comment has been minimized.

Sign in to view
@fmease
Copy link
Member

fmease commented May 31, 2024

@bors retry

@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 May 31, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request May 31, 2024
@bors
Auto merge of rust-lang#125759 - nnethercote:format-some-tests, r=Gui…
e8fd1aa 
…llaumeGomez

Format some tests

There are more directories under `tests/` still to do, but this is enough for one PR.

r? `@GuillaumeGomez`
@bors
Copy link
Contributor

bors commented May 31, 2024

⌛ Testing commit fcfd885 with merge 0347206...

bors added a commit to rust-lang-ci/rust that referenced this pull request May 31, 2024
@bors
Auto merge of rust-lang#125759 - nnethercote:format-some-tests, r=Gui…
0347206 
…llaumeGomez

Format some tests

There are more directories under `tests/` still to do, but this is enough for one PR.

r? `@GuillaumeGomez`
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented May 31, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 31, 2024
@nnethercote
Run rustfmt on tests/run-make/.
3079bd9 
With the exception of `tests/run-make/translation/test.rs`, which has a
syntax error.

The expected output in `rustdoc-error-lines/rmake.rs`'s required slight
tweaking.

The two `reproducible-build.rs` files need `// ignore-tidy-linelength`
because rustfmt produces lines longer than 100 chars, which tidy doesn't
like, yuk.
@nnethercote
Explain why we don't run rustfmt on tests/debuginfo/.
d71a015
@nnethercote
Explain why we don't run rustfmt on tests/incremental/.
0ea498a
@nnethercote
Copy link
Contributor Author

Hopefully I fixed that error...

@bors r=GuillaumeGomez

@bors
Copy link
Contributor

bors commented May 31, 2024

📌 Commit 0ea498a has been approved by GuillaumeGomez

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 May 31, 2024
@jieyouxu
Copy link
Member

(We should update .git-blame-ignore-revs to include these commits after this PR is merged)

@jieyouxu
Copy link
Member

@bors p=10 (making sure this PR gets merged before any rollups)

@bors
Copy link
Contributor

bors commented May 31, 2024

⌛ Testing commit 0ea498a with merge 2a2c29a...

@bors
Copy link
Contributor

bors commented May 31, 2024

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 2a2c29a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 31, 2024
@bors bors merged commit 2a2c29a into rust-lang:master May 31, 2024
7 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 31, 2024
This was referenced May 31, 2024
Merged
Merged
Open
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (2a2c29a): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (secondary -3.6%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -3.6% [-4.0%, -3.2%] 2
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 667.778s -> 669.181s (0.21%)
Artifact size: 318.79 MiB -> 318.82 MiB (0.01%)

@nnethercote nnethercote deleted the format-some-tests branch May 31, 2024 20:39
@nnethercote nnethercote mentioned this pull request Jun 3, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 3, 2024
@bors
Auto merge of rust-lang#125912 - nnethercote:rustfmt-tests-mir-opt, r…
8768db9 
…=oli-obk

rustfmt `tests/mir-opt`

Continuing the work started in rust-lang#125759. Details in individual commit log messages.

r? `@oli-obk`
@nnethercote nnethercote mentioned this pull request Jun 4, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 4, 2024
@bors
Auto merge of rust-lang#125948 - nnethercote:rustfmt-more-tests, r=lqd
bc33782 
rustfmt more tests

This finishes the formatting of tests begun in rust-lang#125759 and continued in rust-lang#125912.

r? `@lqd`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lqd lqd lqd left review comments

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself merged-by-bors This PR was explicitly merged by bors. PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.80.0
Development

Successfully merging this pull request may close these issues.
9 participants
@nnethercote @rustbot @rust-log-analyzer @GuillaumeGomez @bors @fmease @jieyouxu @rust-timer @lqd