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

tmandry · web-flow · commit dbce655eda68 · 2019-09-17T21:27:23.000-07:00
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
diff --git a/src/librustc/mir/interpret/allocation.rs b/src/librustc/mir/interpret/allocation.rs
@@ -130,9 +130,9 @@ impl<Tag> Allocation<Tag> {
     }
 }
 
-impl Allocation<()> {
+impl Allocation<(), ()> {
     /// Add Tag and Extra fields
-    pub fn retag<T, E>(
+    pub fn with_tags_and_extra<T, E>(
         self,
         mut tagger: impl FnMut(AllocId) -> T,
         extra: E,
diff --git a/src/tools/miri b/src/tools/miri
@@ -1 +1 @@
-Subproject commit d88138723780d11ca2c09560111223dc20b9d5f3
+Subproject commit 130f9488d3b861e02c9282b686eec717e30912cf

Original file line number	Diff line number	Diff line change
`@@ -130,9 +130,9 @@ impl<Tag> Allocation<Tag> {`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
`133`		`-impl Allocation<()> {`
	`133`	`+impl Allocation<(), ()> {`
`134`	`134`	`/// Add Tag and Extra fields`
`135`		`- pub fn retag<T, E>(`
	`135`	`+ pub fn with_tags_and_extra<T, E>(`
`136`	`136`	`self,`
`137`	`137`	`mut tagger: impl FnMut(AllocId) -> T,`
`138`	`138`	`extra: E,`