Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 8 pull requests #86982

Merged
merged 19 commits into from
Jul 8, 2021
Merged

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

roxelo and others added 19 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.
remove trailing newline

fix: test with attribute but missing const

Update compiler/rustc_passes/src/stability.rs

Co-authored-by: Léo Lanteri Thauvin <[email protected]>

Add test for extern functions

fix: using span_help instead of span_suggestion

add test for some ABIs + fmt fix

Update compiler/rustc_passes/src/stability.rs

Co-authored-by: Léo Lanteri Thauvin <[email protected]>

Refractor and add test for `impl const`

Add test to make sure no output + cleanup condition

-----------------------------

remove stdcall test, failing CI test

C abi is already tested in this, so it is not that useful to test another one.
The tested code is blind to which specific ABI for now, as long as it's not an intrinsic one
At least one of these is already in-tree; it seems plausible that
others might appear too.

Signed-off-by: Ian Jackson <[email protected]>
…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.
…e_check_const, r=oli-obk

Checking that function is const if marked with rustc_const_unstable

Fixes rust-lang#69630

This one is still missing tests to check the behavior but I checked by hand and it seemed to work.
I would not mind some direction for writing those unit tests!
…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=8 rollup=never

@bors
Copy link
Contributor

bors commented Jul 8, 2021

📌 Commit 6056682 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
@bors
Copy link
Contributor

bors commented Jul 8, 2021

⌛ Testing commit 6056682 with merge aa65b08...

@bors
Copy link
Contributor

bors commented Jul 8, 2021

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing aa65b08 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 8, 2021
@bors bors merged commit aa65b08 into rust-lang:master Jul 8, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 8, 2021
@GuillaumeGomez GuillaumeGomez deleted the rollup-7sbye3c branch July 8, 2021 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.

8 participants