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 #124456

Merged
merged 23 commits into from
Apr 28, 2024
Merged

Rollup of 7 pull requests #124456

merged 23 commits into from
Apr 28, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

matthiaskrgr and others added 23 commits April 21, 2024 14:45
The description was most accurate when it was still called rustbuild,
and I presume indeed did mostly run in CI. It has become something more
so try to describe it better for current-day usage.
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
This makes miri not diverge in behavior, it fixes running Rust linux-gnu
binaries on musl with gcompat, it fixes dlopen edge-cases that cranelift
somehow hits, etc.
…imulacrum

1.78 release notes

cc `@rust-lang/release`

r? `@cuviper`
…crum

`x vendor`

This PR implements `x vendor` on bootstrap; enabling dependency vendoring without the need for developers to have `cargo` installed on their system (previously, we suggested running `cargo vendor ...` but now we can accomplish the same task with `x vendor`).

In addition, fixes rust-lang#112391 problem.
…ce-incr, r=Mark-Simulacrum

add test for incremental ICE: slice-pattern-const.rs rust-lang#83085

Fixes rust-lang#83085
…files-better, r=Mark-Simulacrum

bootstrap: Describe build_steps modules

One of my preferred ways to understand source code is to start with its API. This implies the code is documented reasonably accurately, even if it is a private API. The description of one of these modules had not been updated since 2015 and so was both terse and confusing, so I rewrote it. Then I noticed many others went unremarked, so I offered some remarks.
…rk-Simulacrum

Remove unused `[patch]` for clippy_lints

Looks like it was once used by RLS
…imulacrum

bootstrap: Document `struct Builder` and its fields

I'm exploring the code of bootstrap and had a bit of a hard time understanding exactly what `Builder` is for at first. I decided to help document it and its field to help future explorers.
…nu, r=ChrisDenton

Unconditionally call `really_init` on GNU/Linux

This makes miri not diverge in behavior, it fixes running Rust linux-gnu binaries on musl with gcompat, it fixes dlopen edge-cases that cranelift somehow hits, etc.

Fixes rust-lang#124126

thou hast gazed into this abyss with me:
r? ``@ChrisDenton``
@rustbot rustbot added 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-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 27, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Apr 27, 2024

📌 Commit be89760 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 Apr 27, 2024
@bors
Copy link
Contributor

bors commented Apr 28, 2024

⌛ Testing commit be89760 with merge 0986358...

@bors
Copy link
Contributor

bors commented Apr 28, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 28, 2024
@bors bors merged commit 0986358 into rust-lang:master Apr 28, 2024
11 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 28, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#123248 1.78 release notes 7dd55e0c334998450d5cde185d3b394221581121 (link)
#123942 x vendor 31ea29bdd9ff73c0a5fac533f61cf38a87605f63 (link)
#124165 add test for incremental ICE: slice-pattern-const.rs #83085 3bf2a18250c2a17d567e8533150fe06ee4cc0078 (link)
#124242 bootstrap: Describe build_steps modules 2ec455e1f9147bc055c3585d813d6fdee41d2d78 (link)
#124406 Remove unused [patch] for clippy_lints d8303b1f206e8de06ed5b6e7845ae456bd310a43 (link)
#124429 bootstrap: Document struct Builder and its fields 6a6dbc8161c5df194eba5f0b7ed75b665478647b (link)
#124447 Unconditionally call really_init on GNU/Linux c8d7b077d6d35094b915fe3506ada101ff31881c (link)

previous master: aed2187d53

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 (0986358): 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: 673.038s -> 672.332s (-0.10%)
Artifact size: 315.91 MiB -> 315.93 MiB (0.01%)

@matthiaskrgr matthiaskrgr deleted the rollup-8bm3m6v 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
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-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants