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.

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

migrate fmt-write-bloat to rmake #128147

Merged
merged 2 commits into from
Aug 2, 2024

Conversation

lolbinarycat
Copy link
Contributor

@lolbinarycat lolbinarycat commented Jul 24, 2024

try-job: aarch64-apple
try-job: x86_64-gnu-llvm-18
try-job: dist-x86_64-linux

@rustbot
Copy link
Collaborator

rustbot commented Jul 24, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @jieyouxu (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot
Copy link
Collaborator

rustbot commented Jul 24, 2024

The run-make-support library was changed

cc @jieyouxu

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 24, 2024
@rust-log-analyzer

This comment has been minimized.

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jul 24, 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.

Thanks for the PR. I have some simplification suggestions which should save us from having to roll our own symbol iter based on object.

src/tools/run-make-support/src/lib.rs Outdated Show resolved Hide resolved
tests/run-make/fmt-write-bloat/rmake.rs Outdated Show resolved Hide resolved
src/tools/run-make-support/src/symbols.rs Show resolved Hide resolved
tests/run-make/fmt-write-bloat/rmake.rs Show resolved Hide resolved
@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 Jul 24, 2024
@jieyouxu
Copy link
Member

jieyouxu commented Jul 24, 2024

Please flip to ready-for-review when you addressed the review comments, so I can run try jobs to double-check.

@lolbinarycat
Copy link
Contributor Author

@rustbot review

@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 Jul 24, 2024
@rust-log-analyzer

This comment has been minimized.

@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 Jul 24, 2024
@jieyouxu
Copy link
Member

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 24, 2024
…r=<try>

migrate fmt-write-bloat to rmake

try-job: aarch64-apple
try-job: x86_64-gnu-llvm-18
try-job: dist-x86_64-linux
@bors
Copy link
Contributor

bors commented Jul 24, 2024

⌛ Trying commit 55d5f85 with merge b3a96c9...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Jul 24, 2024

💔 Test failed - checks-actions

@lolbinarycat
Copy link
Contributor Author

@jieyouxu can you try the failing target with the old Makefile test? i kinda suspect that might fail too, since that target doesn't seem to be part of CI

@jieyouxu
Copy link
Member

can you try the failing target with the old Makefile test? i kinda suspect that might fail too, since that target doesn't seem to be part of CI

AFAIK aarch64-apple is part of full build CI (i.e. not part of CI jobs that are run on every PR, but still need to pass when bors actually try to merge ur PR into master). So I'm fairly sure the old Makefile version passed aarch64-apple -- we can run another try-job if you restore the Makefile version temporarily.

@lolbinarycat
Copy link
Contributor Author

@jieyouxu did a quick revert

@jieyouxu
Copy link
Member

@bors try

@bors
Copy link
Contributor

bors commented Jul 24, 2024

⌛ Trying commit fa1c001 with merge c88787f...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 24, 2024
…r=<try>

migrate fmt-write-bloat to rmake

try-job: aarch64-apple
try-job: x86_64-gnu-llvm-18
try-job: dist-x86_64-linux
@lolbinarycat
Copy link
Contributor Author

@rustbot review

@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 Jul 30, 2024
@rust-log-analyzer

This comment has been minimized.

this commit cannot easily be squashed, since there is already a
PR based on the previous commit.
@jieyouxu
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 30, 2024

📌 Commit ebd6718 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 Jul 30, 2024
@tgross35
Copy link
Contributor

this commit cannot easily be squashed, since there is already a
PR based on the previous commit.

(For reference, you would just need to tell tell git to drop the first commit (4feb949) when rebasing that branch on top of master after this merges. It just does this automatically if it is the exact same commit. But yeah, git nuances...)

tgross35 added a commit to tgross35/rust that referenced this pull request Jul 31, 2024
…, r=jieyouxu

migrate fmt-write-bloat to rmake

try-job: aarch64-apple
try-job: x86_64-gnu-llvm-18
try-job: dist-x86_64-linux
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 31, 2024
Rollup of 8 pull requests

Successful merges:

 - rust-lang#125048 (PinCoerceUnsized trait into core)
 - rust-lang#127681 (derive(SmartPointer): rewrite bounds in where and generic bounds)
 - rust-lang#127830 (When an archive fails to build, print the path)
 - rust-lang#128147 (migrate fmt-write-bloat to rmake)
 - rust-lang#128356 (Migrate `cross-lang-lto-clang` and `cross-lang-lto-pgo-smoketest` `run-make` tests to rmake)
 - rust-lang#128387 (More detailed note to deprecate ONCE_INIT)
 - rust-lang#128388 (Match LLVM ABI in `extern "C"` functions for `f128` on Windows)
 - rust-lang#128412 (Remove `crate_level_only` from `ELIDED_LIFETIMES_IN_PATHS`)

r? `@ghost`
`@rustbot` modify labels: rollup
tgross35 added a commit to tgross35/rust that referenced this pull request Aug 1, 2024
…, r=jieyouxu

migrate fmt-write-bloat to rmake

try-job: aarch64-apple
try-job: x86_64-gnu-llvm-18
try-job: dist-x86_64-linux
tgross35 added a commit to tgross35/rust that referenced this pull request Aug 1, 2024
…, r=jieyouxu

migrate fmt-write-bloat to rmake

try-job: aarch64-apple
try-job: x86_64-gnu-llvm-18
try-job: dist-x86_64-linux
tgross35 added a commit to tgross35/rust that referenced this pull request Aug 1, 2024
…, r=jieyouxu

migrate fmt-write-bloat to rmake

try-job: aarch64-apple
try-job: x86_64-gnu-llvm-18
try-job: dist-x86_64-linux
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 1, 2024
Rollup of 7 pull requests

Successful merges:

 - rust-lang#122049 (Promote riscv64gc-unknown-linux-musl to tier 2)
 - rust-lang#128147 (migrate fmt-write-bloat to rmake)
 - rust-lang#128161 (nested aux-build in tests/rustdoc/ tests)
 - rust-lang#128404 (Revert recent changes to dead code analysis)
 - rust-lang#128466 (Update the stdarch submodule)
 - rust-lang#128483 (Still more `cfg` cleanups)
 - rust-lang#128494 (MIR required_consts, mentioned_items: ensure we do not forget to fill these lists)

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

bors commented Aug 2, 2024

⌛ Testing commit ebd6718 with merge 05e692a...

@bors
Copy link
Contributor

bors commented Aug 2, 2024

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing 05e692a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 2, 2024
@bors bors merged commit 05e692a into rust-lang:master Aug 2, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 2, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (05e692a): 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)

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

Cycles

Results (primary 2.2%)

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)
2.2% [2.2%, 2.2%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.2% [2.2%, 2.2%] 1

Binary size

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

Bootstrap: 757.745s -> 757.516s (-0.03%)
Artifact size: 336.82 MiB -> 336.86 MiB (0.01%)

lolbinarycat added a commit to lolbinarycat/rust that referenced this pull request Aug 2, 2024
uses helper functions added in rust-lang#128147, must not be merged before that
PR.
lolbinarycat added a commit to lolbinarycat/rust that referenced this pull request Aug 6, 2024
uses helper functions added in rust-lang#128147, must not be merged before that
PR.
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 7, 2024
…ke, r=<try>

port tests/run-make/extern-fn-reachable to rmake

uses helper functions added in rust-lang#128147, must not be merged before that PR.

try-job: aarch64-apple
try-job: armhf-gnu
try-job: test-various
try-job: x86_64-msvc
try-job: x86_64-mingw
try-job: i686-msvc
try-job: i686-mingw
try-job: x86_64-gnu-llvm-17
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 A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. 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
Status: Done
Development

Successfully merging this pull request may close these issues.

8 participants