Clean up and add tests for slice drop shims#59348
Merged
bors merged 2 commits intorust-lang:masterfrom May 10, 2019
Merged
Conversation
rust-highfive
added
the
S-waiting-on-review
matthewjasper
force-pushed
the
cleanup-drop-shims
branch
from
165e6e0 to
94dfa06
Compare
Member
|
I'm afraid I am not familiar with the drop shim code at all, I just did a few tiny changes to make Miri happy. I am not confident reviewing this. Sorry. Also, does the test pass the same way currently? Would be nice to use that test to see the effect of your changes. |
matthewjasper
force-pushed
the
cleanup-drop-shims
branch
from
94dfa06 to
7ea00e0
Compare
Contributor
Author
|
Maybe @arielb1 could have a look. |
Dylan-DPC-zz
added
S-waiting-on-bors
|
bors: try |
Contributor
Author
|
r? @oli-obk |
oli-obk
reviewed
Apr 29, 2019
matthewjasper
force-pushed
the
cleanup-drop-shims
branch
from
7ea00e0 to
c655481
Compare
Collaborator
|
☔ The latest upstream changes (presumably #60195) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
matthewjasper
force-pushed
the
cleanup-drop-shims
branch
from
c655481 to
6fff547
Compare
arielb1
reviewed
May 9, 2019
| assert!(size <= (u32::MAX as u64), | ||
| "move out check doesn't implemented for array bigger then u32"); | ||
| let size = size as u32; | ||
| let size: u32 = size.try_into().unwrap_or_else(|_| { |
arielb1
reviewed
May 9, 2019
| let succ = self.succ; // FIXME(#43234) | ||
| let loop_block = self.drop_loop( | ||
| succ, | ||
| self.succ, |
Contributor
|
Nice cleanup. @bors r+ |
Collaborator
|
📌 Commit 6fff547 has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
May 9, 2019
…=arielb1 Clean up and add tests for slice drop shims Adds a test for the MIR generated by `real_drop_in_place::<[T]>`. Also slightly reduces the number of statements and locals used in the shim. r? @RalfJung
bors
added a commit
that referenced
this pull request
May 10, 2019
Rollup of 8 pull requests Successful merges: - #59348 (Clean up and add tests for slice drop shims) - #60188 (Identify when a stmt could have been parsed as an expr) - #60234 (std: Derive `Default` for `io::Cursor`) - #60618 (Comment ext::tt::transcribe) - #60648 (Skip codegen for one UI test with long file path) - #60671 (remove unneeded `extern crate`s from build tools) - #60675 (Remove the old await! macro) - #60676 (Fix async desugaring providing wrong input to procedural macros.) Failed merges: r? @ghost
Collaborator
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds a test for the MIR generated by
real_drop_in_place::<[T]>. Also slightly reduces the number of statements and locals used in the shim.r? @RalfJung