Adjust stderr for #1971

Author: oli-obk

tests/ui/box-cell-alias.stderr

@@ -1,8 +1,11 @@
-error: Undefined Behavior: trying to reborrow for SharedReadWrite at alloc978, but parent tag <2075> does not have an appropriate item in the borrow stack
+error: Undefined Behavior: trying to reborrow <2075> for SharedReadWrite permission at alloc978[0x0], but that tag does not exist in the borrow stack for this location
   --> $DIR/box-cell-alias.rs:9:14
    |
-9  |     unsafe { (*ptr).set(20); } //~ ERROR does not have an appropriate item in the borrow stack
-   |              ^^^^^^^^^^^^^^ trying to reborrow for SharedReadWrite at alloc978, but parent tag <2075> does not have an appropriate item in the borrow stack
+9  |     unsafe { (*ptr).set(20); } //~ ERROR does not exist in the borrow stack
+   |              ^^^^^^^^^^^^^^
+   |              |
+   |              trying to reborrow <2075> for SharedReadWrite permission at alloc978[0x0], but that tag does not exist in the borrow stack for this location
+   |              this error occurs as part of a reborrow at alloc978[0x0..0x1]
    |
    = help: this indicates a potential bug in the program: it performed an invalid operation, but the rules it violated are still experimental
    = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information

tests/ui/stacked_borrows/alias_through_mutation.stderr

@@ -1,8 +1,11 @@
-error: Undefined Behavior: no item granting read access to tag <1912> at alloc955 found in borrow stack.
+error: Undefined Behavior: attempting a read access using <1912> at alloc955[0x0], but that tag does not exist in the borrow stack for this location
   --> $DIR/alias_through_mutation.rs:12:16
    |
 12 |     let _val = *target_alias; //~ ERROR borrow stack
-   |                ^^^^^^^^^^^^^ no item granting read access to tag <1912> at alloc955 found in borrow stack.
+   |                ^^^^^^^^^^^^^
+   |                |
+   |                attempting a read access using <1912> at alloc955[0x0], but that tag does not exist in the borrow stack for this location
+   |                this error occurs as part of an access at alloc955[0x0..0x4]
    |
    = help: this indicates a potential bug in the program: it performed an invalid operation, but the rules it violated are still experimental
    = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information

tests/ui/stacked_borrows/aliasing_mut3.stderr

@@ -1,8 +1,11 @@
-error: Undefined Behavior: trying to reborrow for SharedReadOnly at alloc954, but parent tag <untagged> does not have an appropriate item in the borrow stack
+error: Undefined Behavior: trying to reborrow <untagged> for SharedReadOnly permission at alloc954[0x0], but that tag does not exist in the borrow stack for this location
   --> $DIR/aliasing_mut3.rs:3:1
    |
 3  | pub fn safe(_x: &mut i32, _y: &i32) {} //~ ERROR borrow stack
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ trying to reborrow for SharedReadOnly at alloc954, but parent tag <untagged> does not have an appropriate item in the borrow stack
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | |
+   | trying to reborrow <untagged> for SharedReadOnly permission at alloc954[0x0], but that tag does not exist in the borrow stack for this location
+   | this error occurs as part of a reborrow at alloc954[0x0..0x4]
    |
    = help: this indicates a potential bug in the program: it performed an invalid operation, but the rules it violated are still experimental
    = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information

tests/ui/stacked_borrows/box_exclusive_violation1.stderr

@@ -1,8 +1,11 @@
-error: Undefined Behavior: no item granting read access to tag <1990> at alloc970 found in borrow stack.
+error: Undefined Behavior: attempting a read access using <1990> at alloc970[0x0], but that tag does not exist in the borrow stack for this location
   --> $DIR/box_exclusive_violation1.rs:11:3
    |
 11 |   *our //~ ERROR borrow stack
-   |   ^^^^ no item granting read access to tag <1990> at alloc970 found in borrow stack.
+   |   ^^^^
+   |   |
+   |   attempting a read access using <1990> at alloc970[0x0], but that tag does not exist in the borrow stack for this location
+   |   this error occurs as part of an access at alloc970[0x0..0x4]
    |
    = help: this indicates a potential bug in the program: it performed an invalid operation, but the rules it violated are still experimental
    = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information

tests/ui/stacked_borrows/buggy_as_mut_slice.stderr

@@ -1,8 +1,11 @@
-error: Undefined Behavior: no item granting write access to tag <2098> at alloc967+0x4 found in borrow stack.
+error: Undefined Behavior: attempting a write access using <2098> at alloc967[0x4], but that tag does not exist in the borrow stack for this location
   --> $DIR/buggy_as_mut_slice.rs:15:5
    |
 15 |     v1[1] = 5;
-   |     ^^^^^^^^^ no item granting write access to tag <2098> at alloc967+0x4 found in borrow stack.
+   |     ^^^^^^^^^
+   |     |
+   |     attempting a write access using <2098> at alloc967[0x4], but that tag does not exist in the borrow stack for this location
+   |     this error occurs as part of an access at alloc967[0x4..0x8]
    |
    = help: this indicates a potential bug in the program: it performed an invalid operation, but the rules it violated are still experimental
    = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information

tests/ui/stacked_borrows/buggy_split_at_mut.stderr

@@ -1,8 +1,11 @@
-error: Undefined Behavior: trying to reborrow for Unique at alloc953, but parent tag <1931> does not have an appropriate item in the borrow stack
+error: Undefined Behavior: trying to reborrow <1931> for Unique permission at alloc953[0x0], but that tag does not exist in the borrow stack for this location
   --> $DIR/buggy_split_at_mut.rs:19:10
    |
 19 |     let (a, b) = safe::split_at_mut(&mut array, 0);
-   |          ^ trying to reborrow for Unique at alloc953, but parent tag <1931> does not have an appropriate item in the borrow stack
+   |          ^
+   |          |
+   |          trying to reborrow <1931> for Unique permission at alloc953[0x0], but that tag does not exist in the borrow stack for this location
+   |          this error occurs as part of a reborrow at alloc953[0x0..0x10]
    |
    = help: this indicates a potential bug in the program: it performed an invalid operation, but the rules it violated are still experimental
    = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information

tests/ui/stacked_borrows/illegal_read1.stderr

@@ -1,8 +1,11 @@
-error: Undefined Behavior: no item granting read access to tag <1903> at alloc953 found in borrow stack.
+error: Undefined Behavior: attempting a read access using <1903> at alloc953[0x0], but that tag does not exist in the borrow stack for this location
  --> $DIR/illegal_read1.rs:9:16
   |
 9 |     let _val = *xref; // ...but any use of raw will invalidate our ref.
-  |                ^^^^^ no item granting read access to tag <1903> at alloc953 found in borrow stack.
+  |                ^^^^^
+  |                |
+  |                attempting a read access using <1903> at alloc953[0x0], but that tag does not exist in the borrow stack for this location
+  |                this error occurs as part of an access at alloc953[0x0..0x4]
   |
   = help: this indicates a potential bug in the program: it performed an invalid operation, but the rules it violated are still experimental
   = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information

tests/ui/stacked_borrows/illegal_read2.stderr

@@ -1,8 +1,11 @@
-error: Undefined Behavior: no item granting read access to tag <1903> at alloc953 found in borrow stack.
+error: Undefined Behavior: attempting a read access using <1903> at alloc953[0x0], but that tag does not exist in the borrow stack for this location
  --> $DIR/illegal_read2.rs:9:16
   |
 9 |     let _val = *xref; // ...but any use of raw will invalidate our ref.
-  |                ^^^^^ no item granting read access to tag <1903> at alloc953 found in borrow stack.
+  |                ^^^^^
+  |                |
+  |                attempting a read access using <1903> at alloc953[0x0], but that tag does not exist in the borrow stack for this location
+  |                this error occurs as part of an access at alloc953[0x0..0x4]
   |
   = help: this indicates a potential bug in the program: it performed an invalid operation, but the rules it violated are still experimental
   = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information

tests/ui/stacked_borrows/illegal_read3.stderr

@@ -1,8 +1,11 @@
-error: Undefined Behavior: no item granting read access to tag <1925> at alloc953 found in borrow stack.
+error: Undefined Behavior: attempting a read access using <1925> at alloc953[0x0], but that tag does not exist in the borrow stack for this location
   --> $DIR/illegal_read3.rs:17:16
    |
 17 |     let _val = *xref2;
-   |                ^^^^^^ no item granting read access to tag <1925> at alloc953 found in borrow stack.
+   |                ^^^^^^
+   |                |
+   |                attempting a read access using <1925> at alloc953[0x0], but that tag does not exist in the borrow stack for this location
+   |                this error occurs as part of an access at alloc953[0x0..0x4]
    |
    = help: this indicates a potential bug in the program: it performed an invalid operation, but the rules it violated are still experimental
    = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information

tests/ui/stacked_borrows/illegal_read4.stderr

@@ -1,8 +1,11 @@
-error: Undefined Behavior: no item granting read access to tag <1903> at alloc953 found in borrow stack.
+error: Undefined Behavior: attempting a read access using <1903> at alloc953[0x0], but that tag does not exist in the borrow stack for this location
  --> $DIR/illegal_read4.rs:8:20
   |
 8 |     let _illegal = *xref2; //~ ERROR borrow stack
-  |                    ^^^^^^ no item granting read access to tag <1903> at alloc953 found in borrow stack.
+  |                    ^^^^^^
+  |                    |
+  |                    attempting a read access using <1903> at alloc953[0x0], but that tag does not exist in the borrow stack for this location
+  |                    this error occurs as part of an access at alloc953[0x0..0x4]
   |
   = help: this indicates a potential bug in the program: it performed an invalid operation, but the rules it violated are still experimental
   = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information