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 9 pull requests #77102

Merged
merged 37 commits into from
Sep 24, 2020
Merged

Rollup of 9 pull requests #77102

merged 37 commits into from
Sep 24, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

lcnr and others added 30 commits September 19, 2020 22:17
This is needed for Atomic::from_mut.
Instead of a few hardcoded cfg(target_arch = ..) like before.
This was missed in PR rust-lang#75465. As a result, a few places have been using
the full body span of functions, instead of just the header span.
I little clarification
Continuation of rust-lang#74526

Adds the #[track_caller] attribute to almost all panicking Cell
functions. The ones that borrow two Cells in their function
body are spared, because the panic location helps pinpoint
which of the two borrows failed. You'd need to have
full debuginfo and backtraces enabled together with column
info in order to be able to discern the cases.
Column info is only available on non-Windows platforms.
Record `tcx.def_span` instead of `item.span` in crate metadata

This was missed in PR rust-lang#75465. As a result, a few places have been using
the full body span of functions, instead of just the header span.
emit errors during AbstractConst building

There changes are currently still untested, so I don't expect this to pass CI 😆

It seems to me like this is the direction we want to go in, though we didn't have too much of a discussion about this.

r? @oli-obk
…-from-mut, r=Amanieu

Add cfg(target_has_atomic_equal_alignment) and use it for Atomic::from_mut.

Fixes some platform-specific problems with rust-lang#74532 by using the actual alignment of the types instead of hardcoding a few `target_arch`s.

r? @RalfJung
Changing the alloc() to accept &self instead of &mut self

Fixes: [rust-lang#55](rust-lang/wg-allocators#55)

This is the first cut. It only makes the change for `alloc` method.
fix small typo in docs and comments

Fixed `the the` to `the`, as far as I found.
…-iter, r=Dylan-DPC

Add missing examples on Vec iter types

r? @Dylan-DPC
Improve documentation for ToSocketAddrs

I little clarification
Miri: more informative deallocation error messages

Make sure we show the affected AllocId.

r? @oli-obk
…ulacrum

Add #[track_caller] to more panicking Cell functions

Continuation of rust-lang#74526

Adds the #[track_caller] attribute to almost all panicking Cell
functions. The ones that borrow two Cells in their function
body are spared, because the panic location helps pinpoint
which of the two borrows failed. You'd need to have
full debuginfo and backtraces enabled together with column
info in order to be able to discern the cases.
Column info in debuginfo is only available on non-Windows platforms.
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 23, 2020

📌 Commit c3c03f2 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 Sep 23, 2020
@Dylan-DPC-zz
Copy link
Author

@bors rollup=never :P

@bors
Copy link
Contributor

bors commented Sep 23, 2020

⌛ Testing commit c3c03f2 with merge c351775...

@bors
Copy link
Contributor

bors commented Sep 24, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 24, 2020
@bors bors merged commit c351775 into rust-lang:master Sep 24, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 24, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #77102!

Tested on commit c351775.
Direct link to PR: #77102

💔 miri on windows: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Sep 24, 2020
Tested on commit rust-lang/rust@c351775.
Direct link to PR: <rust-lang/rust#77102>

💔 miri on windows: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → test-fail (cc @oli-obk @eddyb @RalfJung).
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.