Skip to content

Rollup of 7 pull requests #73168

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

Closed
wants to merge 17 commits into from

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

nagisa and others added 17 commits June 3, 2020 16:29
In particular matching on complex types such as strings will cause
deep recursion to happen.

Fixes rust-lang#72933
I wasn't aware items _could_ be fake, so I think having a function
mentioning it could be helpful. Also, I'd need to make this change for
cross-crate intra-doc links anyway, so I figured it's better to make the
refactor separate.
This causes unnecessary calls to `grow` when the allocation would fit
exactly in the remaining space.
They are pointless. No reasonable allocator will be able to satisfy a
`reserve_in_place` request that *doubles* the size of an allocation when
dealing with allocations that are 4 KiB and larger.

Just to be sure, I confirmed on Linux that the `reserve_in_place` calls
never succeed.

(Note however that the `reserve_in_place` call for `DroplessArena::grow`
did occasionally succeed prior to the off-by-one fix in the previous
commit, because we would sometimes do a `reserve_in_place` request for
the chunk's current size, which would trivially succeed!)
Also remove a now-unnecessary `placement` argument.
- Use `len` more consistently for the number of elements in a vector,
  because that's the usual name.
- Use `additional` more consistently for the number of elements we want
  to add, because that's what `Vec::reserve()` uses.
- Use `cap` consistently rather than `capacity`.
- Plus a few other tweaks.

This increases consistency and conciseness.
…ace, r=Amanieu

Remove `RawVec::reserve_in_place`.

And some related clean-ups.

r? @oli-obk
…i-obk

Ensure stack when building MIR for matches

In particular matching on complex types such as strings will cause
deep recursion to happen.

Fixes rust-lang#72933

r? @matthewjasper @oli-obk
…Gomez

Add Item::is_fake for rustdoc

I wasn't aware items _could_ be fake, so I think having a function
mentioning it could be helpful. Also, I'd need to make this change for
cross-crate intra-doc links anyway, so I figured it's better to make the
refactor separate.
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=7

@bors
Copy link
Collaborator

bors commented Jun 9, 2020

📌 Commit b044a95 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 Jun 9, 2020
@bors
Copy link
Collaborator

bors commented Jun 9, 2020

⌛ Testing commit b044a95 with merge 6f2ba8098b2e80ba50ceb2fb88b198b2c5519750...

@bors
Copy link
Collaborator

bors commented Jun 9, 2020

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 9, 2020
@Dylan-DPC-zz
Copy link
Author

@bors retry

@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 Jun 9, 2020
@bors
Copy link
Collaborator

bors commented Jun 9, 2020

⌛ Testing commit b044a95 with merge 6491ac9644ed562e8b7778e41016899397ac8f4a...

@Dylan-DPC-zz
Copy link
Author

@bors retry

(cc @rust-lang/infra on another timeout)

@bors
Copy link
Collaborator

bors commented Jun 9, 2020

⌛ Testing commit b044a95 with merge 8d7caa787fb13e16e39165b913e7b80d5ebac55d...

@bors
Copy link
Collaborator

bors commented Jun 9, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 9, 2020
@Dylan-DPC-zz
Copy link
Author

wasm failure looks spurious at the moment.. going to retry in a bigger rollup

@Dylan-DPC-zz Dylan-DPC-zz deleted the rollup-88m5jpg branch June 9, 2020 23:04
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants