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 7 pull requests #128109

Merged
merged 19 commits into from
Jul 23, 2024
Merged

Rollup of 7 pull requests #128109

merged 19 commits into from
Jul 23, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Alexendoo and others added 19 commits July 10, 2024 13:41
This is another accidental omission from rust-lang#126967 (in addition
to rust-lang#127867) which fixes an issue where `wasm-component-ld` isn't
distributed via rustup just yet because while it's present in the
sysroot it's not present in the tarballs.
Primarily needed by CI runners to avoid handling download-rustc incompatible
options one by one on shell scripts.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
…sue-15460, r=jieyouxu

Migrate run make issue 15460

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: x86_64-msvc
try-job: aarch64-apple
try-job: x86_64-gnu-llvm-18
…nk-framework, r=Kobzol

Migrate `run-make/link-framework` to `rmake.rs`

Part of rust-lang#121876.

r? ``@Kobzol``

try-job: x86_64-apple-1
…ss35

Support lists and stylings in more places for `rustc --explain`

Adds support for `*foo*`, stylings not immediately following whitespace e.g. ``(`Foo`)`` and lists starting with whitespace:

```md
* previously supported
```
```md
 * now also supported
 ```

These are fairly common in the existing error docs, some before/after examples:

### E0460

![image](https://github.com/rust-lang/rust/assets/1830331/4d0dc5dd-b71f-48b1-97ae-9f7199e952ed)
![image](https://github.com/rust-lang/rust/assets/1830331/4bbcb1e4-99ba-4d0d-b338-fe19d96a5eb1)

### E0059

![image](https://github.com/rust-lang/rust/assets/1830331/8457f69a-3126-4777-aa4a-953f7b29f59b)
![image](https://github.com/rust-lang/rust/assets/1830331/ac2189f8-512e-4b3b-886d-6c4a619d17f2)
…=jieyouxu

Migrate `lto-linkage-used-attr`, `no-duplicate-libs` and `pgo-gen-no-imp-symbols` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

try-job: x86_64-msvc
try-job: aarch64-apple
try-job: armhf-gnu
try-job: test-various
try-job: x86_64-gnu-llvm-18
…t-ld-for-real-this-time-maybe-let-see-after-this-merges, r=onur-ozkan

Fix inclusion of `wasm-component-ld` in dist artifacts

This is another accidental omission from rust-lang#126967 (in addition to rust-lang#127867) which fixes an issue where `wasm-component-ld` isn't distributed via rustup just yet because while it's present in the sysroot it's not present in the tarballs.
…ebank

Note closure captures when reporting cast to fn ptr failed

Fixes rust-lang#128078

We already had logic to point out a closure having captures when that's possibly the source of a coercion error to `fn()`, but we weren't reporting it during an explicit `as` cast.
…aviour, r=Kobzol

make it possible to disable download-rustc if it's incompatible

Primarily needed by CI runners to avoid handling download-rustc incompatible options one by one on shell scripts.

This will significantly help to rust-lang#122709.
@rustbot 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jul 23, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Jul 23, 2024

📌 Commit 041b8c4 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 Jul 23, 2024
@bors
Copy link
Contributor

bors commented Jul 23, 2024

⌛ Testing commit 041b8c4 with merge 8bfcae7...

@bors
Copy link
Contributor

bors commented Jul 23, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 8bfcae7 to master...

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#125886 Migrate run make issue 15460 c3fc9a91d8c11658f12a80e1a5750e05d3502908 (link)
#126898 Migrate run-make/link-framework to rmake.rs 841af727c6d4cbcdfc9280e87fb7397c038297c0 (link)
#126994 Support lists and stylings in more places for `rustc --expl… da1acbc54b508cbd503ea5087ce0f204ba2bc0fe (link)
#127990 Migrate lto-linkage-used-attr, no-duplicate-libs and `p… 9f92fcad293a782a284215b60e4a3d640e2b20d2 (link)
#128060 Fix inclusion of wasm-component-ld in dist artifacts 0cc272d1968e231eb6ce94c2c9963cff7a8d889d (link)
#128082 Note closure captures when reporting cast to fn ptr failed 740d40bfd112c044c847e78c03e17ffde9df26eb (link)
#128098 make it possible to disable download-rustc if it's incompat… 6ee38976b9e88b9cdd6bff089acfdeaa13bc44c4 (link)

previous master: 84c257ebe5

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 (8bfcae7): 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 (secondary 2.4%)

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

Binary size

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

Bootstrap: 771.292s -> 771.348s (0.01%)
Artifact size: 328.81 MiB -> 328.86 MiB (0.01%)

@matthiaskrgr matthiaskrgr deleted the rollup-gc7kopi branch September 1, 2024 17:35
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. 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.

10 participants