Skip to content

Rollup of 6 pull requests #104711

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 14 commits into from
Nov 22, 2022
Merged

Rollup of 6 pull requests #104711

merged 14 commits into from
Nov 22, 2022

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

mati865 and others added 14 commits November 15, 2022 23:24
…rity, r=eholk

Check generics parity before collecting return-position `impl Trait`s in trait

The only thing is that this duplicates the error message for number of generics mismatch, but we already deduplicate that error message in Cargo. I could add a flag to delay the error if the reviewer cares.

Fixes rust-lang#104281

Also drive-by adds a few comments to the `collect_trait_impl_trait_tys` method, and removes an unused argument from `compare_number_of_generics`.
…md64, r=thomcc

Reduce exceptions overallocation on non Windows x86_64

Addressing rust-lang#103894 (comment)
…lowering, r=compiler-errors

Create def_id for async fns during lowering

r? `@compiler-errors`
…-bindings, r=cjgillot

Only declare bindings for if-let guards once per arm

Currently, each candidate for a match arm uses separate locals for the bindings in the if-let guard, causing problems (rust-lang#88015) when those branches converge in the arm body.

Fixes rust-lang#88015 (🤞)
…pty-hack, r=TaKO8Ki

Remove a lifetime resolution hack from `compare_predicate_entailment`

This is not needed anymore, probably due to rust-lang#102334 equating the function signatures fully in `collect_trait_impl_trait_tys`. Also, the assertion in in rust-lang#102903 makes sure that this is actually fixed, so I'm pretty confident this isn't needed.
…thomcc

disable strict-provenance-violating doctests in Miri

Most of these are on deprecated unstable functions anyway. This lets us run the remaining doctests with `-Zmiri-strict-provenance`, which I think is a win.

r? `@thomcc`
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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 Nov 22, 2022
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Nov 22, 2022

📌 Commit a40659d has been approved by Dylan-DPC

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 Nov 22, 2022
@bors
Copy link
Collaborator

bors commented Nov 22, 2022

⌛ Testing commit a40659d with merge 66ccf36...

@bors
Copy link
Collaborator

bors commented Nov 22, 2022

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing 66ccf36 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 22, 2022
@bors bors merged commit 66ccf36 into rust-lang:master Nov 22, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 22, 2022
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#104710 b5ca460e1e8c76c94b2ab4442bf8f49f5d6d1c24
#104701 973300c230f3ec31950e09b79d41dfd77492840d
#104669 64f5dd40113f34f862b14b7109ae72d12de17912
#104615 59aec03a7738f2ce516d7ec9ba4107c5da6bd28e
#104464 60dc0c47ab02e388fb0f80db12606e045a747303
#104295 b8eec1b0442bd5a8156ea00bd4c630b1b0335177

previous master: b7463e8bdb

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 (66ccf36): 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

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.6% [2.1%, 3.0%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

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

# for free to join this conversation on GitHub. Already have an account? # 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-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.

9 participants