rust (original) (raw)

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 andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Conversation40 Commits1 Checks6 Files changed

Conversation

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

[ Show hidden characters]({{ revealButtonHref }})

Part of #121876.

r? @jieyouxu

try-job: x86_64-msvc
try-job: aarch64-gnu
try-job: aarch64-apple

rustbot added A-run-make

Area: port run-make Makefiles to rmake.rs

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

Jun 16, 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

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've left some review comments.

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 16, 2024

Running a subset of full CI jobs just to be sure.
@bors try

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 16, 2024

bors added a commit to rust-lang-ci/rust that referenced this pull request

Jun 16, 2024

…try>

Migrate run-make/comment-section to rmake.rs

Part of rust-lang#121876.

r? @jieyouxu

try-job: dist-aarch64-linux try-job: dist-armhf-linux try-job: x86_64-gnu-llvm-18 try-job: test-various try-job: dist-various-1

@bors rollup=iffy (checks object file contents, possibly fragile)

☀️ Try build successful - checks-actions
Build commit: 7fa8271 (7fa8271da35084ee07e37d15cf50815525c99643)

Looks good, thanks!
@bors r+

📌 Commit 12d8ccf has been approved by jieyouxu

It is now in the queue for this repository.

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 16, 2024

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout comment-section-migration (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self comment-section-migration --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Removing tests/run-make/comment-section/Makefile
Auto-merging src/tools/tidy/src/allowed_run_make_makefiles.txt
Auto-merging src/tools/run-make-support/src/llvm.rs
CONFLICT (content): Merge conflict in src/tools/run-make-support/src/llvm.rs
Automatic merge failed; fix conflicts and then commit the result.

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

Jun 16, 2024

bors added the S-waiting-on-author

Status: This is awaiting some action (such as code changes or more information) from the author.

label

Jun 18, 2024

I'll take a closer look tmrw

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 19, 2024

@Rejyr can you leave a // FIXME(jieyouxu): check cross-compile setup in the test and add a //@ ignore-cross-compile for now? I am suspecting this is a run-make setup problem in cross-compilation scenarios but I don't want to block this PR on that.

bors added a commit to rust-lang-ci/rust that referenced this pull request

Jun 19, 2024

…try>

Migrate run-make/comment-section to rmake.rs

Part of rust-lang#121876.

r? @jieyouxu

try-job: x86_64-msvc try-job: aarch64-gnu try-job: aarch64-apple

☀️ Try build successful - checks-actions
Build commit: dfa9504 (dfa9504e85cb0d289c3a963b4542c1ae938533e4)

📌 Commit f44494c has been approved by jieyouxu

It is now in the queue for this repository.

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 19, 2024

jieyouxu added a commit to jieyouxu/rust that referenced this pull request

Jun 19, 2024

…=jieyouxu

Migrate run-make/comment-section to rmake.rs

Part of rust-lang#121876.

r? @jieyouxu

try-job: x86_64-msvc try-job: aarch64-gnu try-job: aarch64-apple

jieyouxu added a commit to jieyouxu/rust that referenced this pull request

Jun 19, 2024

…=jieyouxu

Migrate run-make/comment-section to rmake.rs

Part of rust-lang#121876.

r? @jieyouxu

try-job: x86_64-msvc try-job: aarch64-gnu try-job: aarch64-apple

bors added a commit to rust-lang-ci/rust that referenced this pull request

Jun 20, 2024

Rollup of 9 pull requests

Successful merges:

rust-lang#126095 (Migrate link-args-order, ls-metadata and lto-readonly-lib run-make tests to rmake)
rust-lang#126534 (Migrate run-make/comment-section to rmake.rs)
rust-lang#126620 (Actually taint InferCtxt when a fulfillment error is emitted)
rust-lang#126629 (Migrate run-make/compressed-debuginfo to rmake.rs)
rust-lang#126644 (Rewrite extern-flag-rename-transitive. debugger-visualizer-dep-info, metadata-flag-frobs-symbols, extern-overrides-distribution and forced-unwind-terminate-pof run-make tests to rmake)
rust-lang#126650 (Rename a bunch of things in the new solver and rustc_type_ir)
rust-lang#126698 (Migrate unknown-mod-stdin, issue-68794-textrel-on-minimal-lib, raw-dylib-cross-compilation and used-cdylib-macos run-make tests to rmake)
rust-lang#126703 (reword the hint::blackbox non-guarantees)
rust-lang#126708 (Minimize can_begin_literal_maybe_minus usage)

r? @ghost @rustbot modify labels: rollup

Finished benchmarking commit (54fcd5b): 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 (primary -2.3%, secondary -3.8%)

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)	-2.3%	[-2.3%, -2.3%]	1
Improvements ✅ (secondary)	-3.8%	[-4.6%, -3.1%]	2
All ❌✅ (primary)	-2.3%	[-2.3%, -2.3%]	1