Skip to content

Rollup of 5 pull requests #70816

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 18 commits into from
Apr 5, 2020
Merged

Rollup of 5 pull requests #70816

merged 18 commits into from
Apr 5, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

Aaron1011 and others added 18 commits April 5, 2020 01:21
This improves the performance of drain_filter and is needed for
future Cursor support for BTreeMap.
…=nikomatsakis

Query-ify Instance::resolve

Split off from rust-lang#65989

Instance::resolve is now a wrapper for a new `resolve_instance` query.
This greatly improves performance on several benchmarks
Don't import integer and float modules, use assoc consts

Stop importing the standard library integer and float modules to reach the `MIN`, `MAX` and other constants. They are available directly on the primitive types now.

This PR is a follow up of rust-lang#69860 which made sure we use the new constants in documentation.

This type of change touches a lot of files, and previously all my assoc int consts PRs had collisions and were accepted only after a long delay. So I'd prefer to do it in smaller steps now. Just removing these imports seem like a good next step.

r? @dtolnay
…rk-Simulacrum

Keep track of position when deleting from a BTreeMap

This improves the performance of drain_filter and is needed for future Cursor support for BTreeMap.

cc @ssomers
r? @Mark-Simulacrum
…r=LukasKalbertodt

Do not use "nil" to refer to `()`

"nil" is not used in the [book](https://doc.rust-lang.org/book) or in the [standard library](https://doc.rust-lang.org/std) anywhere else. Because "nil" is often used in programming languages to refer to "None" or "null" I think it could be a little confusing for newcomers to see this type referred to as "nil".
…evink

Enable layout debugging for `impl Trait` type aliases

I also made it print the actual type name that the alias picks under the hood.
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Apr 5, 2020
@Dylan-DPC-zz
Copy link
Author

@bors r+ p=5 rollup=never

@bors
Copy link
Collaborator

bors commented Apr 5, 2020

📌 Commit 8c081f6 has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 5, 2020
@bors
Copy link
Collaborator

bors commented Apr 5, 2020

⌛ Testing commit 8c081f6 with merge b543afc...

@bors
Copy link
Collaborator

bors commented Apr 5, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing b543afc to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 5, 2020
@bors bors merged commit b543afc into rust-lang:master Apr 5, 2020
@nnethercote
Copy link
Contributor

One of these commits caused some huge improvements to some style-servo compile times. Yay!

@Aaron1011: is this because of #67797?

@Aaron1011
Copy link
Member

@nnethercote: Yes, I believe so. I had previously done several perf runs for #67797, which showed large speedups for 'patched-incremental'.

# 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants