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

Rollup of 5 pull requests #135040

Merged
merged 10 commits into from
Jan 2, 2025
Merged

Rollup of 5 pull requests #135040

merged 10 commits into from
Jan 2, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

jieyouxu and others added 10 commits January 2, 2025 15:55
Range metadata was disabled for amdgpu due to a backend bug. I did not
encounter any problems when removing the workaround to enable range
metadata (tried compiling `core` and `alloc`), so I assume this has
been fixed in LLVM in the last years.

Remove the workaround to re-enable range metadata.
The formatting command previously had two issues:
- if rustfmt failed, it would print the command invocation. this is
  unnecessarily noisy
- there was a race condition that lead to orphan rustfmts that would
  print their output after bootstrap exited

We fix this by
- removing the printing, it's not really useful
- threading failure through properly instead of just yoloing exit(1)
…bzol

Ping me for rustc-dev-guide subtree changes on this repo

r? `@Kobzol`
…=compiler-errors

Remove range-metadata amdgpu workaround

Range metadata was disabled for amdgpu due to a backend bug. I did not encounter any problems when removing the workaround to enable range metadata (tried compiling `core` and `alloc`), so I assume this has been fixed in LLVM in the last years.

Remove the workaround to re-enable range metadata.

Tracking issue: rust-lang#135024
try to dedup me in the mailmap

I have a few more aliases than appeared in the mail map. Perhaps that is why I have been duplicated.
Fix formatting command

The formatting command previously had two issues:
- if rustfmt failed, it would print the command invocation. this is unnecessarily noisy
- there was a race condition that lead to orphan rustfmts that would print their output after bootstrap exited

We fix this by
- removing the printing, it's not really useful
- threading failure through properly instead of just yoloing exit(1)
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jan 2, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jan 2, 2025

📌 Commit 666794e has been approved by matthiaskrgr

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 Jan 2, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 2, 2025
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#135016 (Ping me for rustc-dev-guide subtree changes on this repo)
 - rust-lang#135027 (Remove range-metadata amdgpu workaround)
 - rust-lang#135029 (Update mailmap)
 - rust-lang#135033 (try to dedup me in the mailmap)
 - rust-lang#135035 (Fix formatting command)

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

bors commented Jan 2, 2025

⌛ Testing commit 666794e with merge 4363f9b...

@bors
Copy link
Contributor

bors commented Jan 2, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 4363f9b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 2, 2025
@bors bors merged commit 4363f9b into rust-lang:master Jan 2, 2025
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Jan 2, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#135016 Ping me for rustc-dev-guide subtree changes on this repo 4900d2e500514fa1ef34db0e08d7be81f7a4f714 (link)
#135027 Remove range-metadata amdgpu workaround b2c9fc2cdb42621f69871991eb6acd753c4ac37f (link)
#135029 Update mailmap 895cd81407cfe7125e29664474ce46943f07ea0b (link)
#135033 try to dedup me in the mailmap af93162388e6215a249c86d887c249358b89a74e (link)
#135035 Fix formatting command 01672eb21b9c2f12f05ac540c4534581afb10c3b (link)

previous master: 1b2745d72a

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4363f9b): 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

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: 762.677s -> 763.571s (0.12%)
Artifact size: 325.50 MiB -> 325.58 MiB (0.02%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants