Skip to content
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

Rollup of 6 pull requests #86979

Closed
wants to merge 15 commits into from

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

roxelo and others added 15 commits June 29, 2021 17:47
This commit makes the documentation of `BTreeSet::drain_filter` more
consistent with that of `BTreeMap::drain_filter` after the changes in
f0b8166.

In particular, this explicitly documents the iteration order.
At least one of these is already in-tree; it seems plausible that
others might appear too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
…ls, r=oli-obk

Rework SESSION_GLOBALS API

Fixes rust-lang#84954.

<s>Needs rust-lang#84953 to be merged first (I cherry-picked its commits to have CI pass).</s> (done)

r? `@Aaron1011`
…-rfc2229-migration, r=nikomatsakis

Use diagnostic items instead of lang items for rfc2229 migrations

This PR removes the `Send`, `UnwindSafe` and `RefUnwindSafe` lang items introduced in rust-lang#84730, and uses diagnostic items instead to check for `Send`, `UnwindSafe` and `RefUnwindSafe` traits for RFC2229 migrations.

r? ``@nikomatsakis``
… r=kennytm

Update BTreeSet::drain_filter documentation

This commit makes the documentation of `BTreeSet::drain_filter` more
consistent with that of `BTreeMap::drain_filter` after the changes in
f0b8166.

In particular, this explicitly documents the iteration order.
…items, r=jyn514

Document rustdoc with `--document-private-items`

The `tool_doc` macro introduced in rust-lang#86737 did not use `false` as the default value for `binary` when it is not provided, so the `if` is not even expanded and thus the argument is never provided if the `binary` argument isn't.

Resolves rust-lang#86900

r? ``@Mark-Simulacrum``
mailmap: Add alternative addresses for myself

At least one of these is already in-tree; it seems plausible that the others might appear too.
@rustbot rustbot added the rollup A PR which is a rollup label Jul 8, 2021
@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented Jul 8, 2021

📌 Commit 2cfddb4 has been approved by GuillaumeGomez

@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 Jul 8, 2021
@GuillaumeGomez
Copy link
Member Author

I'll make a bigger one. :3

@GuillaumeGomez GuillaumeGomez deleted the rollup-k88s2py branch July 8, 2021 16:29
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
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.

8 participants