Skip to content

Rollup of 5 pull requests - #99802

Merged
bors merged 24 commits into
rust-lang:masterfrom
JohnTitor:rollup-uaklql1
Jul 27, 2022
Merged

Rollup of 5 pull requests#99802
bors merged 24 commits into
rust-lang:masterfrom
JohnTitor:rollup-uaklql1

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

bjorn3and others added 24 commits July 25, 2022 16:07
It isn't clear most people other than me and it blocks formatting by
rustfmt.
This reduces the amount of llvm ir lines for intrinsic related code from
23801 to 20478.
Check that RPITs constrained by a recursive call in a closure are compatible
Fixesrust-lang#99073
Adapts a similar visitor pattern to `find_opaque_ty_constraints` (that we use to check TAITs), but with some changes:
0. Only walk the "OnlyBody" children, instead of all items in the RPIT's defining scope
1. Only walk through the body's children if we found a constraining usage
2. Don't actually do any inference, just do a comparison and error if they're mismatched
----
r? `@oli-obk` -- you know all this impl-trait stuff best... is this the right approach? I can explain the underlying issue better if you'd like, in case that might reveal a better solution. Not sure if it's possible to gather up the closure's defining usages of the RPIT while borrowck'ing the outer function, that might be a better place to put this check...
…nst_trait, r=oli-obk
Add `Self: ~const Trait` to traits with `#[const_trait]`
r? `@oli-obk`
…jorn3
Sync rustc_codegen_cranelift
I did a large refactoring of the intrinsics module to remove the intrinsic_match macro which is not very clear to other people. This also enables rustfmt to run on this code. While I already did a sync yesterday, I am going to do another sync again to avoid potential conflicts as those will likely be painful to resolve.
r? ``@ghost``
``@rustbot`` label +A-codegen +A-cranelift +T-compiler
…oval, r=GuillaumeGomez
rustdoc: remove Clean trait impls for more items
Follow up to rust-lang#99638 and	rust-lang#99672
…iler-errors
Refactor: use `pluralize!`
Use `pluralize!` in more places
@rustbotrustbot added 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jul 27, 2022
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=5 rollup=never

@bors

bors commented Jul 27, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit e0f88b3 has been approved by JohnTitor

It is now in the queue for this repository.

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 27, 2022
@bors

bors commented Jul 27, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e0f88b3 with merge 2a22093...

@bors

bors commented Jul 27, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing 2a22093 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jul 27, 2022
@bors
bors merged commit 2a22093 into rust-lang:masterJul 27, 2022
@rustbotrustbot added this to the 1.64.0 milestone Jul 27, 2022
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (2a22093): comparison url.

Instruction count

  • Primary benchmarks: 😿 relevant regressions found
  • Secondary benchmarks: no relevant changes found
mean1maxcount2
Regressions 😿
(primary)
0.3%0.3%2
Regressions 😿
(secondary)
N/AN/A0
Improvements 🎉
(primary)
N/AN/A0
Improvements 🎉
(secondary)
N/AN/A0
All 😿🎉 (primary)0.3%0.3%2

Max RSS (memory usage)

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: mixed results
mean1maxcount2
Regressions 😿
(primary)
N/AN/A0
Regressions 😿
(secondary)
2.9%3.1%2
Improvements 🎉
(primary)
N/AN/A0
Improvements 🎉
(secondary)
-2.8%-2.8%1
All 😿🎉 (primary)N/AN/A0

Cycles

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: 😿 relevant regressions found
mean1maxcount2
Regressions 😿
(primary)
N/AN/A0
Regressions 😿
(secondary)
4.7%7.3%2
Improvements 🎉
(primary)
N/AN/A0
Improvements 🎉
(secondary)
N/AN/A0
All 😿🎉 (primary)N/AN/A0

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. the arithmetic mean of the percent change23

  2. number of relevant changes23

@JohnTitor
JohnTitor deleted the rollup-uaklql1 branch July 27, 2022 21:16
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.T-rustdocRelevant 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

@JohnTitor@bors@rust-timer@rustbot@bjorn3@compiler-errors@fee1-dead@notriddle@TaKO8Ki