Skip to content

Rollup of 5 pull requests - #70807

Merged
bors merged 20 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-qd1kgl2
Apr 5, 2020
Merged

Rollup of 5 pull requests#70807
bors merged 20 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-qd1kgl2

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost

RalfJungand others added 20 commits March 30, 2020 11:58
also add smoke test to detect relocation even in rustc runs
…nieu
Fix some aliasing issues in Vec
`Vec::extend` and `Vec::truncate` invalidated references into the vector even without reallocation, because they (implicitly) created a mutable reference covering the *entire* initialized part of the vector.
Fixesrust-lang#70301
I verified the fix by adding some new tests here that I ran in Miri.
docs: make the description of Result::map_or more clear
The documentation of [`Result::map_or`](https://doc.rust-lang.org/std/result/enum.Result.html#method.map_or) is very unclear and confusing, probably because it was copied straight from [`Option::map_or`](https://doc.rust-lang.org/std/option/enum.Option.html#method.map_or) and someone forgot to adapt it for Result.
Miri: remove an outdated FIXME
We even [have a test ](https://github.com/rust-lang/rust/blob/49dc2f9f091748beb1a8a9d5b3eb3bbe7362c3bd/src/test/ui/consts/miri_unleashed/drop.rs) making sure that we detect dropping with a non-const implementation.
r? @oli-obk
…ekmann
clarify comment in RawVec::into_box
On first reading I almost thought "len <= cap" would be all that there is to check here. Expand the comment to clarify that that is not the case.
…ddyb
fix Miri assignment sanity check
Thanks @eddyb for pointing me to the right APIs!
r? @eddybFixesrust-lang#70804
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ p=5 rollup=never

@bors

bors commented Apr 5, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 31b8d65 has been approved by Dylan-DPC

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 5, 2020
@bors

bors commented Apr 5, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 31b8d65 with merge e6cef04...

@bors

bors commented Apr 5, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 5, 2020
@bors
bors merged commit e6cef04 into rust-lang:masterApr 5, 2020
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #70807!

Tested on commit e6cef04.
Direct link to PR: #70807

🎉 rls on linux: test-fail → test-pass (cc @Xanewok).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 5, 2020
Tested on commit rust-lang/rust@e6cef04.
Direct link to PR: <rust-lang/rust#70807>
🎉 rls on linux: test-fail → test-pass (cc @Xanewok).
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: 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

@Dylan-DPC-zz@bors@rust-highfive@RalfJung@PonasKovas@Dylan-DPC