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.

Sign up for GitHub

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

Jump to bottom

rename Allocation::retag -> with_tags_and_extra #64503

Merged
merged 2 commits into from
Sep 18, 2019
Merged

rename Allocation::retag -> with_tags_and_extra #64503

merged 2 commits into from
Sep 18, 2019

Conversation

RalfJung
Copy link
Member

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 16, 2019
@oli-obk
Copy link
Contributor

oli-obk commented Sep 16, 2019

@bors r+ rollup

feel free to merge this with a miri-up for p=1

@bors
Copy link
Contributor

bors commented Sep 16, 2019

📌 Commit ac8ecbc9dc32aed661107bec30644130a5a326f4 has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 16, 2019
@RalfJung
Copy link
Member Author

@bors r-
Yielding to #64485.

feel free to merge this with a miri-up for p=1

I'm afraid that might just end up in a mess...

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 16, 2019
@RalfJung RalfJung mentioned this pull request Sep 17, 2019
Merged
@RalfJung
Copy link
Member Author

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Sep 17, 2019

📌 Commit 686170e has been approved by oli-obk

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 17, 2019
@RalfJung
Copy link
Member Author

@bors rollup-

@tmandry
Copy link
Member

tmandry commented Sep 17, 2019

I think you meant...
@bors rollup=never

@RalfJung
Copy link
Member Author

Not really, I just meant to undo the bors rollup from earlier.
But I never know what to do with these flags anyway so whatever.^^

@tmandry
Copy link
Member

tmandry commented Sep 17, 2019

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...

@tmandry
Copy link
Member

tmandry commented Sep 17, 2019

@bors rollup=maybe

tmandry added a commit to tmandry/rust that referenced this pull request Sep 18, 2019
@tmandry
Rollup merge of rust-lang#64503 - RalfJung:miri-retag, r=oli-obk
dbce655 
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
@tmandry tmandry mentioned this pull request Sep 18, 2019
Merged
bors added a commit that referenced this pull request Sep 18, 2019
@bors
Auto merge of #64570 - tmandry:rollup-3pg02lj, r=tmandry
64c0969 
Rollup of 4 pull requests

Successful merges:

 - #64486 (Print out more information for `-Zunpretty=expanded,hygiene`)
 - #64503 (rename Allocation::retag -> with_tags_and_extra)
 - #64516 (update Nomicon and Reference)
 - #64528 (Load proc macro metadata in the correct order.)

Failed merges:

r? @ghost
@RalfJung
Copy link
Member Author

@bors rollup-
clears all rollup information (AFAIK)

@bors bors merged commit 686170e into rust-lang:master Sep 18, 2019
bors added a commit to rust-lang/miri that referenced this pull request Sep 18, 2019
@bors
Auto merge of #956 - rust-lang:rustup-retag, r=RalfJung
d83bcbd 
rustup for retag rename

This is the Miri side of rust-lang/rust#64503. Do not force-push!
@RalfJung RalfJung deleted the miri-retag branch September 19, 2019 06:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@oli-obk oli-obk

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@RalfJung @oli-obk @bors @tmandry @rust-highfive