rename Allocation::retag -> with_tags_and_extra#64503
Merged
bors merged 2 commits intorust-lang:masterfrom Sep 18, 2019
Merged
Conversation
rust-highfive
added
the
S-waiting-on-review
Contributor
|
@bors r+ rollup feel free to merge this with a miri-up for p=1 |
Collaborator
|
📌 Commit ac8ecbc9dc32aed661107bec30644130a5a326f4 has been approved by |
bors
added
S-waiting-on-bors
Member
Author
bors
added
S-waiting-on-author
RalfJung
force-pushed
the
miri-retag
branch
from
ac8ecbc to
e8d858e
Compare
Member
Author
|
@bors r=oli-obk |
Collaborator
|
📌 Commit 686170e has been approved by |
bors
added
S-waiting-on-bors
Member
Author
|
@bors rollup- |
Member
|
I think you meant... |
Member
Author
|
Not really, I just meant to undo the |
Member
|
Oh, sorry about that then! I didn't think rollup- was a valid command. Now I have no idea how to undo what I did... |
Member
|
@bors rollup=maybe |
tmandry
added a commit
to tmandry/rust
that referenced
this pull request
Sep 18, 2019
rename Allocation::retag -> with_tags_and_extra This is more consistent with `Pointer::with_tag`. Also, "retag" is a [term from Stacked Borrows](https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md#retagging) with a [corresponding Machine hook](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_mir/interpret/machine/trait.Machine.html#method.retag), and this function has nothing to do with that other use of the term. r? @oli-obk
Member
Author
|
@bors rollup- |
bors
added a commit
to rust-lang/miri
that referenced
this pull request
Sep 18, 2019
rustup for retag rename This is the Miri side of rust-lang/rust#64503. Do not force-push!
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
5 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.
This is more consistent with
Pointer::with_tag. Also, "retag" is a term from Stacked Borrows with a corresponding Machine hook, and this function has nothing to do with that other use of the term.r? @oli-obk