bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #64503 - RalfJung:miri-retag, r=oli-obk

Browse source 
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
This commit is contained in:
Tyler Mandry 2019-09-17 21:27:23 -07:00 • committed by GitHub
commit dbce655eda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc/mir/interpret/allocation.rs
View file

@ -130,9 +130,9 @@ impl<Tag> Allocation<Tag> {
} }
} }
impl Allocation<()> { impl Allocation<(), ()> {
/// Add Tag and Extra fields /// Add Tag and Extra fields
pub fn retag<T, E>( pub fn with_tags_and_extra<T, E>(
self, self,
mut tagger: impl FnMut(AllocId) -> T, mut tagger: impl FnMut(AllocId) -> T,
extra: E, extra: E,

2
src/tools/miri

@ -1 +1 @@
Subproject commit d88138723780d11ca2c09560111223dc20b9d5f3 Subproject commit 130f9488d3b861e02c9282b686eec717e30912cf