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 7 pull requests #71556

Merged
merged 19 commits into from
Apr 25, 2020
Merged

Rollup of 7 pull requests #71556

merged 19 commits into from
Apr 25, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

Thom Chiovoloni and others added 19 commits March 7, 2020 16:14
… instead of the other way around.
These are semantically the same, but `find_map()` is more concise.
proc_macro: Stabilize `Span::resolved_at` and `Span::located_at`

Introduced in rust-lang#47149.
Part of rust-lang#54725.

Motivation: rust-lang#68716 (comment).
Identifiers in proc macros may want to inherit span locations for diagnostics from one tokens (e.g. some tokens from the macro input), but resolve those identifiers from some different location (e.g. from the macro's definition site).
This becomes especially important when multiple resolution locations become available with stabilization of [`Span::mixed_site`](rust-lang#68716).

Why I think this is the right API for setting span's location and hygiene - rust-lang#69041 (comment).

r? @dtolnay
Implement BitOr and BitOrAssign for the NonZero integer types

This provides overloaded operators for `NonZero$Int | NonZero$Int`, `NonZero$Int | $Int`, and `$Int | NonZero$Int`. It also provides `BitOrAssign` where `self` is `NonZero$Int`, for symmetry.

It's a pretty small conceptual addition, but is good becasue but avoids a case where the operation is obviously sound, but you'd otherwise need unsafe to do it.

In crates trying to minimize `unsafe` usage, this is unfortunate and makes working with `NonZero` types often not worth it, even if the operations you're doing are clearly sound.

I've marked these as stable as I've been told in the past that trait impls are automatically stable. I'm happy to change it to unstable if this wasn't correct information.

I'm not entirely confident what version I should have put down, so I followed https://www.whatrustisit.com. Hopefully it's correct for this.

Apologies in advance if this has come up before, but I couldn't find it.
stabilize BTreeMap::remove_entry

This PR stabilizes `BTreeMap::remove_entry` as implemented in rust-lang#68378.

Closes rust-lang#66714
…nieu

Deprecate `{Box,Rc,Arc}::into_raw_non_null`

Per ongoing FCP at rust-lang#47336 (comment)
See also rust-lang#47336 (comment)
…ulacrum

Replace filter_map().next() calls with find_map()

These are semantically the same, but `find_map()` is more concise.
Fix comment in docstring example for Error::kind

Saw it while reading the docs.
Add missing Send and Sync impls for linked list Cursor and CursorMut.

Someone pointed out these to me, and i think it's indeed reasonable to add those impl.

r? @Amanieu
@Dylan-DPC-zz
Copy link
Author

@bors p=7 rollup=never r+

@bors
Copy link
Contributor

bors commented Apr 25, 2020

📌 Commit 82642d7 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 25, 2020
@bors
Copy link
Contributor

bors commented Apr 25, 2020

⌛ Testing commit 82642d7 with merge 0862458...

@bors
Copy link
Contributor

bors commented Apr 25, 2020

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

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

Something in this rollup had positive perf impact, which is cool

https://perf.rust-lang.org/compare.html?start=659951c4a0d7450e43f61c61c0e87d0ceae17087&end=0862458dad90a0d80827e22e3f86e33add6d847c&stat=instructions:u

script-servo got 27% faster on patched incremental println benchmark

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. 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.

10 participants