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

Improve code of run-make/llvm-ident #127237

Merged
merged 1 commit into from
Jul 8, 2024

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Jul 2, 2024

Follow-up of #126941.

r? @Kobzol

@rustbot
Copy link
Collaborator

rustbot commented Jul 2, 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 2, 2024
Copy link
Contributor

@Kobzol Kobzol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice cleanup! I think that we can base this on top of #126957 once it is merged (hopefully it should be close to being done).

src/tools/run-make-support/src/lib.rs Outdated Show resolved Hide resolved
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 5, 2024
…vm-ident-code, r=jieyouxu

Improve run make llvm ident code

I took the commits that are not blocking rust-lang#127237.

r? `@Kobzol`
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 5, 2024
Rollup merge of rust-lang#127359 - GuillaumeGomez:improve-run-make-llvm-ident-code, r=jieyouxu

Improve run make llvm ident code

I took the commits that are not blocking rust-lang#127237.

r? `@Kobzol`
@bors
Copy link
Contributor

bors commented Jul 5, 2024

☔ The latest upstream changes (presumably #127360) made this pull request unmergeable. Please resolve the merge conflicts.

@jieyouxu
Copy link
Member

jieyouxu commented Jul 6, 2024

@rustbot author (the pulled out PR merged)

@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 6, 2024
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Jul 6, 2024
…code, r=jieyouxu

Improve run make llvm ident code

I took the commits that are not blocking rust-lang/rust#127237.

r? `@Kobzol`
@GuillaumeGomez GuillaumeGomez force-pushed the improve-run-make-llvm-ident branch from 2e5959f to aa1c24a Compare July 8, 2024 18:18
@GuillaumeGomez
Copy link
Member Author

Used the new function and removed the parts that were added in another PR.

@GuillaumeGomez
Copy link
Member 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 Jul 8, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Jul 8, 2024

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jul 8, 2024

📌 Commit aa1c24a has been approved by Kobzol

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 8, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 8, 2024
…llaumeGomez

Rollup of 4 pull requests

Successful merges:

 - rust-lang#126427 (Rewrite `intrinsic-unreachable`, `sepcomp-cci-copies`, `sepcomp-inlining` and `sepcomp-separate` `run-make` tests to rmake.rs)
 - rust-lang#127237 (Improve code of `run-make/llvm-ident`)
 - rust-lang#127325 (Migrate `target-cpu-native`,  `target-specs` and `target-without-atomic-cas` `run-make` tests to rmake)
 - rust-lang#127482 (Infer async closure signature from (old-style) two-part `Fn` + `Future` bounds)

Failed merges:

 - rust-lang#127357 (Remove `StructuredDiag`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 485a861 into rust-lang:master Jul 8, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 8, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 8, 2024
Rollup merge of rust-lang#127237 - GuillaumeGomez:improve-run-make-llvm-ident, r=Kobzol

Improve code of `run-make/llvm-ident`

Follow-up of rust-lang#126941.

r? `@Kobzol`
@GuillaumeGomez GuillaumeGomez deleted the improve-run-make-llvm-ident branch July 8, 2024 22:57
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.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

5 participants