diff options
| author | Tyler Mandry <tmandry@gmail.com> | 2019-09-17 21:27:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-17 21:27:23 -0700 |
| commit | dbce655eda68a5f18a9593f9b6c6842693fcbabb (patch) | |
| tree | 7f3cb6accf7fcbecff65898662fc4093c548febb | |
| parent | a8aa5114bf13d9c6b2b870c5bf63eab8e70a0018 (diff) | |
| parent | 686170e87de3493e86fee3a74e10263026fabbbb (diff) | |
| download | rust-dbce655eda68a5f18a9593f9b6c6842693fcbabb.tar.gz rust-dbce655eda68a5f18a9593f9b6c6842693fcbabb.zip | |
Rollup merge of #64503 - RalfJung:miri-retag, r=oli-obk
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
| -rw-r--r-- | src/librustc/mir/interpret/allocation.rs | 4 | ||||
| m--------- | src/tools/miri | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/librustc/mir/interpret/allocation.rs b/src/librustc/mir/interpret/allocation.rs index 755cda792ba..15e6cb6bcab 100644 --- 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 -Subproject d88138723780d11ca2c09560111223dc20b9d5f +Subproject 130f9488d3b861e02c9282b686eec717e30912c |