Fix liballoc test suite for Miri#76662
Merged
bors merged 3 commits intorust-lang:masterfrom Sep 16, 2020
Merged
Conversation
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
the8472
reviewed
Sep 13, 2020
the8472
reviewed
Sep 13, 2020
Member
|
r=me with CI passing. |
93361d2 to
bb41740
Compare
Member
Author
|
@bors r=Mark-Simulacrum rollup |
Collaborator
|
📌 Commit bb41740 has been approved by |
RalfJung
added a commit
to RalfJung/rust
that referenced
this pull request
Sep 13, 2020
…lacrum Fix liballoc test suite for Miri Mostly, fix the regression introduced by rust-lang#75207 that caused slices (i.e., references) to be created to invalid memory or memory that has aliasing pointers that we want to keep valid. @dylni this changes the type of `check_range` to only require the length, not the full reference to the slice, which indeed is all the information this function requires. Also reduce the size of a test introduced in rust-lang#70793 to make it not take 3 minutes in Miri. This makes https://github.com/RalfJung/miri-test-libstd work again.
This was referenced Sep 13, 2020
RalfJung
added a commit
to RalfJung/rust
that referenced
this pull request
Sep 13, 2020
…lacrum Fix liballoc test suite for Miri Mostly, fix the regression introduced by rust-lang#75207 that caused slices (i.e., references) to be created to invalid memory or memory that has aliasing pointers that we want to keep valid. @dylni this changes the type of `check_range` to only require the length, not the full reference to the slice, which indeed is all the information this function requires. Also reduce the size of a test introduced in rust-lang#70793 to make it not take 3 minutes in Miri. This makes https://github.com/RalfJung/miri-test-libstd work again.
Collaborator
|
☔ The latest upstream changes (presumably #76311) made this pull request unmergeable. Please resolve the merge conflicts. Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels: |
bb41740 to
a2391d5
Compare
a2391d5 to
c528d24
Compare
Member
Author
|
@bors r=Mark-Simulacrum |
Collaborator
|
📌 Commit 7d67546 has been approved by |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 16, 2020
Rollup of 10 pull requests Successful merges: - rust-lang#76056 (Add more info for Vec Drain doc) - rust-lang#76062 (Vec slice example fix style and show type elision) - rust-lang#76262 (Use inline(never) instead of cold) - rust-lang#76335 (Make all methods of `Duration` unstably const) - rust-lang#76366 (Add Arith Tests in Library) - rust-lang#76369 (Move Various str tests in library) - rust-lang#76534 (Add doc comments for From impls) - rust-lang#76622 (Update bootstrap readme) - rust-lang#76641 (Some cleanup changes and commenting) - rust-lang#76662 (Fix liballoc test suite for Miri) Failed merges: r? `@ghost`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 18, 2020
…-bounds, r=KodrAus Move `slice::check_range` to `RangeBounds` Since this method doesn't take a slice anymore (rust-lang#76662), it makes more sense to define it on `RangeBounds`. Questions: - Should the new method be `assert_len` or `assert_length`?
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
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.
Mostly, fix the regression introduced by #75207 that caused slices (i.e., references) to be created to invalid memory or memory that has aliasing pointers that we want to keep valid. @dylni this changes the type of
check_rangeto only require the length, not the full reference to the slice, which indeed is all the information this function requires.Also reduce the size of a test introduced in #70793 to make it not take 3 minutes in Miri.
This makes https://github.com/RalfJung/miri-test-libstd work again.