Target of name is wrong

rust-lang · Jun 22, 2023 · d3e83e1 · d3e83e1
1 parent 6db68aa
commit d3e83e1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/tests/pass/tree_borrows/formatting.rs b/tests/pass/tree_borrows/formatting.rs
@@ -16,7 +16,8 @@ fn main() {
 // decimal digits to verify proper padding.
 unsafe fn alignment_check() {
     let data: &mut [u8] = &mut [0; 1024];
-    name!(data.as_ptr()=>2, "data");
+    name!(data.as_ptr(), "data");
+    name!(data.as_ptr(), "data");
     let alloc_id = alloc_id!(data.as_ptr());
     let x = &mut data[1];
     name!(x as *mut _, "data[1]");

diff --git a/tests/pass/tree_borrows/formatting.stderr b/tests/pass/tree_borrows/formatting.stderr
@@ -2,7 +2,7 @@
 Warning: this tree is indicative only. Some tags may have been hidden.
 0..  1..  2.. 10.. 11..100..101..1000..1001..1024
 | Act| Act| Act| Act| Act| Act|  Act|  Act|  Act|    └─┬──<TAG=root of the allocation>
-| Res| Act| Res| Act| Res| Act|  Res|  Act|  Res|      └─┬──<TAG=data>
+| Res| Act| Res| Act| Res| Act|  Res|  Act|  Res|      └─┬──<TAG=data, data>
 |----| Act|----|?Dis|----|?Dis| ----| ?Dis| ----|        ├────<TAG=data[1]>
 |----|----|----| Act|----|?Dis| ----| ?Dis| ----|        ├────<TAG=data[10]>
 |----|----|----|----|----| Frz| ----| ?Dis| ----|        ├────<TAG=data[100]>

diff --git a/tests/pass/tree_borrows/unique.default.stderr b/tests/pass/tree_borrows/unique.default.stderr
@@ -3,19 +3,19 @@ Warning: this tree is indicative only. Some tags may have been hidden.
 0..  1
 | Act|    └─┬──<TAG=root of the allocation>
 | Res|      └─┬──<TAG=base>
-| Res|        └────<TAG=raw, uniq>
+| Res|        └────<TAG=raw, uniq, uniq>
 ──────────────────────────────────────────────────────────────────────
 ──────────────────────────────────────────────────────────────────────
 Warning: this tree is indicative only. Some tags may have been hidden.
 0..  1
 | Act|    └─┬──<TAG=root of the allocation>
 | Act|      └─┬──<TAG=base>
-| Act|        └────<TAG=raw, uniq>
+| Act|        └────<TAG=raw, uniq, uniq>
 ──────────────────────────────────────────────────────────────────────
 ──────────────────────────────────────────────────────────────────────
 Warning: this tree is indicative only. Some tags may have been hidden.
 0..  1
 | Act|    └─┬──<TAG=root of the allocation>
 | Act|      └─┬──<TAG=base>
-| Act|        └────<TAG=raw, uniq>
+| Act|        └────<TAG=raw, uniq, uniq>
 ──────────────────────────────────────────────────────────────────────
diff --git a/tests/pass/tree_borrows/unique.rs b/tests/pass/tree_borrows/unique.rs
@@ -25,6 +25,7 @@ fn main() {
         // and uninitialized permissions.
         let uniq = Unique::new_unchecked(raw);
         name!(uniq.as_ptr(), "uniq");
+        name!(uniq.as_ptr(), "uniq");
         print_state!(alloc_id);
 
         // We can activate the Unique and use it mutably.

diff --git a/tests/pass/tree_borrows/unique.uniq.stderr b/tests/pass/tree_borrows/unique.uniq.stderr
@@ -4,21 +4,21 @@ Warning: this tree is indicative only. Some tags may have been hidden.
 | Act|    └─┬──<TAG=root of the allocation>
 | Res|      └─┬──<TAG=base>
 | Res|        └─┬──<TAG=raw>
-|----|          └────<TAG=uniq>
+|----|          └────<TAG=uniq, uniq>
 ──────────────────────────────────────────────────────────────────────
 ──────────────────────────────────────────────────────────────────────
 Warning: this tree is indicative only. Some tags may have been hidden.
 0..  1
 | Act|    └─┬──<TAG=root of the allocation>
 | Act|      └─┬──<TAG=base>
 | Act|        └─┬──<TAG=raw>
-| Act|          └────<TAG=uniq>
+| Act|          └────<TAG=uniq, uniq>
 ──────────────────────────────────────────────────────────────────────
 ──────────────────────────────────────────────────────────────────────
 Warning: this tree is indicative only. Some tags may have been hidden.
 0..  1
 | Act|    └─┬──<TAG=root of the allocation>
 | Act|      └─┬──<TAG=base>
 | Act|        └─┬──<TAG=raw>
-| Dis|          └────<TAG=uniq>
+| Dis|          └────<TAG=uniq, uniq>
 ──────────────────────────────────────────────────────────────────────