Skip to content

Rollup of 6 pull requests #128481

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 12 commits into from
Aug 1, 2024
Merged

Rollup of 6 pull requests #128481

merged 12 commits into from
Aug 1, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

maurer and others added 12 commits July 31, 2024 01:03
Our minimum supported API version is 21, remove hacks to support older
Android APIs.
Everything works as before, + now bootstrap allows for individually selecting LLVM
tools (e.g., `x dist opt llvm-dis`) to include in the dist artifact.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
…ss35

android: Remove libstd hacks for unsupported Android APIs

Our minimum supported API version is 21, remove hacks to support older Android APIs.

try-job: arm-android

r? tgross35
…rly, r=albertlarsan68,Kobzol

improve bootstrap to allow selecting llvm tools individually

Everything works as before, + now bootstrap allows for individually selecting LLVM tools (e.g., `x dist opt llvm-dis`) to include in the dist artifact.
Create COFF archives for non-LLVM backends

`ar_archive_writer` now supports creating COFF archives, so enable them for the non-LLVM backends when requested.

r? ``@bjorn3``
…compiler-errors

Emit an error if `#[optimize]` is applied to an incompatible item

rust-lang#54882

The RFC specifies that this should emit a lint. I used the same allow logic as the `coverage` attribute (also allowing modules and impl blocks) - this should possibly be changed depending on if it's decided to allow 'propogation' of the attribute.
Finish blessing `coverage/mcdc` tests after LLVM 19 upgrade

Context: rust-lang#127513 (comment)

These changes aren't needed for Rust CI, because after the LLVM 19 upgrade we have no jobs that run these tests in `coverage-run` mode against LLVM 18. But they might help external builds.

The longer-term plan is to completely drop (unstable) MC/DC support on LLVM 18, as part of getting it working on LLVM 19 in rust-lang#126733.

cc `@cuviper`
…e-revs, r=jieyouxu

Ignore `use` declaration reformatting in `.git-blame-ignore-revs`.

The reformatting was done in rust-lang#125443.

r? `@lcnr`
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself O-unix Operating system: Unix-like 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Aug 1, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Collaborator

bors commented Aug 1, 2024

📌 Commit ff1476c 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 Aug 1, 2024
@bors
Copy link
Collaborator

bors commented Aug 1, 2024

⌛ Testing commit ff1476c with merge 97ac52f...

@bors
Copy link
Collaborator

bors commented Aug 1, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 97ac52f to master...

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#128416 android: Remove libstd hacks for unsupported Android APIs aa130093e7dc1e988daec9ead5fae63eb55e34a8 (link)
#128437 improve bootstrap to allow selecting llvm tools individually 557c669a38c8389c9db991e5cbbeb2d135d4cbb5 (link)
#128450 Create COFF archives for non-LLVM backends 2c2898af8aa1206f2fa0ea304ba31944e9b1f809 (link)
#128458 Emit an error if #[optimize] is applied to an incompatibl… 9bf55a2ad7ffba0f59db1330c00ec27780e67204 (link)
#128477 Finish blessing coverage/mcdc tests after LLVM 19 upgrade bbddd64927cf96887f5be3be15972434d37cc51b (link)
#128478 Ignore use declaration reformatting in `.git-blame-ignore… 2da53ff994192d789d7d70549a5341b923082049 (link)

previous master: 70591dc15d

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 (97ac52f): 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 -5.5%)

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

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: 757.358s -> 758.41s (0.14%)
Artifact size: 336.90 MiB -> 336.92 MiB (0.01%)

@matthiaskrgr matthiaskrgr deleted the rollup-efa706r branch September 1, 2024 17:35
# for free to join this conversation on GitHub. Already have an account? # 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. O-unix Operating system: Unix-like 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. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants