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 3 pull requests #68363

Merged
merged 9 commits into from
Jan 19, 2020
Merged

Rollup of 3 pull requests #68363

merged 9 commits into from
Jan 19, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

GuillaumeGomez and others added 9 commits January 16, 2020 13:54
It's confusing because it conflicts with ty::Const and just isn't
generally useful.
…ef, r=Dylan-DPC

[const-prop] Remove useless typedef

It's confusing because it conflicts with `ty::Const` and just isn't
generally useful.
Make iter::Empty<T> Send and Sync for any T

Continuing from rust-lang#57682

It's quite funny, when I initially submitted this pull request, I said "Likely nobody will be using that property of `iter::empty`", but then a year later I got a compilation error because it wasn't `Send` and `Sync`.

Unfortunately, `PhantomData<fn() -> T>` still errors out. Oh well. I proposed `
struct PhantomFnWorkaround<T>(fn() -> T);`, but dtolnay did not like it, so using explicit implementations.
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=3

@bors
Copy link
Contributor

bors commented Jan 19, 2020

📌 Commit d276e69 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 Jan 19, 2020
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Jan 19, 2020
@bors
Copy link
Contributor

bors commented Jan 19, 2020

⌛ Testing commit d276e69 with merge c0e02ad...

bors added a commit that referenced this pull request Jan 19, 2020
Rollup of 3 pull requests

Successful merges:

 - #67682 ([const-prop] Remove useless typedef)
 - #68247 (Clean up err codes)
 - #68348 (Make iter::Empty<T> Send and Sync for any T)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jan 19, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 19, 2020
@bors bors merged commit d276e69 into rust-lang:master Jan 19, 2020
@Dylan-DPC-zz Dylan-DPC-zz deleted the rollup-33enndv branch January 19, 2020 17:28
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.

6 participants