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

Merged
merged 14 commits into from
Apr 19, 2024
Merged

Rollup of 5 pull requests #124170

merged 14 commits into from
Apr 19, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

jieyouxu and others added 14 commits April 17, 2024 16:28
This needs to start downloading the descriptions after aliases
have been added to the result set.
It's looks overkill to use rayon to collect cpu usage
(this currently produces malformed mir: we call `eq` with first argument not
being a reference)
…, r=compiler-errors

Correctly change type when adding adjustments on top of `NeverToAny`

I'm concerned that the check only caught the problem with `fallback = !`, because at least MIR contained `<() as PartialEq>::eq(move _5, move _7)` where `_5: ()`.

I rediscovered the issue when looking at rust-lang#123482's crater run.

r? compiler-errors
Fixes rust-lang#120600
run-make: refactor out command wrappers for `clang` and `llvm-readobj`

This PR is rebased on top of rust-lang#123699.

This PR is a follow up to rust-lang#123612 to refactor out command wrappers into the support library for `llvm-readobj` and `clang`.

r? ghost
…p, r=oli-obk

Don't repeatedly duplicate TAIT lifetimes for each subsequently nested TAIT

Make it so that nested TAITs inherit the lifetimes from their parent item, not their parent TAIT. This is because we don't need to re-duplicate lifetimes for nested TAITs over and over, since the only lifetimes they can capture are from the parent item anyways.

This mirrors how RPITs work. This is **not** a functional change that should be observable, since the whole point of duplicating lifetimes and marking the shadowed ones (and uncaptured ones) as bivariant is designed to *not* be observable.

r? oli-obk
…GuillaumeGomez

rustdoc-search: fix description on aliases in results

This needs to start downloading the descriptions after aliases have been added to the result set.
…arsan68

bootstrap: don't use rayon for sysinfo

It's looks overkill to use rayon to collect cpu usage
@rustbot rustbot added 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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 19, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 19, 2024

📌 Commit f1e536d 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 19, 2024
@bors
Copy link
Contributor

bors commented Apr 19, 2024

⌛ Testing commit f1e536d with merge f9b1614...

@bors
Copy link
Contributor

bors commented Apr 19, 2024

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

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#123571 Correctly change type when adding adjustments on top of `Ne… be01b79e2ff0d4844d451608bc8102f5e1b13330 (link)
#123729 run-make: refactor out command wrappers for clang and `ll… e35875763b73ea90048d0d70feb3437b12c0936f (link)
#124106 Don't repeatedly duplicate TAIT lifetimes for each subseque… ad060cad25bceec65cd7d172a45353863d44e2d1 (link)
#124149 rustdoc-search: fix description on aliases in results c3ab69a0beca00009693fe4dcff1d46af40bc50b (link)
#124155 bootstrap: don't use rayon for sysinfo a8dc427a769cc66262ee4977782c97f6fd91c1a1 (link)

previous master: ce3263e60e

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 (f9b1614): 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

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.8% [2.8%, 2.8%] 1
Improvements ✅
(primary)
-1.1% [-1.3%, -0.9%] 4
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.1% [-1.3%, -0.9%] 4

Binary size

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

Bootstrap: 672.283s -> 671.274s (-0.15%)
Artifact size: 315.27 MiB -> 315.25 MiB (-0.01%)

@matthiaskrgr matthiaskrgr deleted the rollup-ldopl64 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. 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-rustdoc Relevant to the rustdoc 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