Skip to content

Commit 99f4573

Browse files
Add deref definition location
Update conflict_errors.rs Add deref definition location
1 parent 8412da6 commit 99f4573

File tree

9 files changed

+41
-0
lines changed

9 files changed

+41
-0
lines changed

compiler/rustc_mir/src/borrow_check/diagnostics/conflict_errors.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1568,6 +1568,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
15681568
"borrow occurs due to deref coercion to `{}`",
15691569
deref_target_ty
15701570
));
1571+
err.span_note(tcx.def_span(instance.def_id()), "deref defined here");
15711572
}
15721573
}
15731574
}

src/test/ui/borrowck/issue-81365-1.stderr

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ LL | first;
99
| ----- borrow later used here
1010
|
1111
= note: borrow occurs due to deref coercion to `DerefTarget`
12+
note: deref defined here
13+
--> $DIR/issue-81365-1.rs:12:5
14+
|
15+
LL | type Target = DerefTarget;
16+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
1217

1318
error: aborting due to previous error
1419

src/test/ui/borrowck/issue-81365-2.stderr

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ LL | first;
99
| ----- borrow later used here
1010
|
1111
= note: borrow occurs due to deref coercion to `DerefTarget`
12+
note: deref defined here
13+
--> $DIR/issue-81365-2.rs:12:5
14+
|
15+
LL | type Target = DerefTarget;
16+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
1217

1318
error: aborting due to previous error
1419

src/test/ui/borrowck/issue-81365-3.stderr

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ LL | first;
99
| ----- borrow later used here
1010
|
1111
= note: borrow occurs due to deref coercion to `Container`
12+
note: deref defined here
13+
--> $DIR/issue-81365-3.rs:23:5
14+
|
15+
LL | type Target = Container;
16+
| ^^^^^^^^^^^^^^^^^^^^^^^^
1217

1318
error: aborting due to previous error
1419

src/test/ui/borrowck/issue-81365-4.stderr

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ LL | first;
99
| ----- borrow later used here
1010
|
1111
= note: borrow occurs due to deref coercion to `Container`
12+
note: deref defined here
13+
--> $DIR/issue-81365-4.rs:24:5
14+
|
15+
LL | type Target = Container;
16+
| ^^^^^^^^^^^^^^^^^^^^^^^^
1217

1318
error: aborting due to previous error
1419

src/test/ui/borrowck/issue-81365-5.stderr

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ LL | first;
99
| ----- borrow later used here
1010
|
1111
= note: borrow occurs due to deref coercion to `DerefTarget`
12+
note: deref defined here
13+
--> $DIR/issue-81365-5.rs:19:5
14+
|
15+
LL | type Target = DerefTarget;
16+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
1217

1318
error: aborting due to previous error
1419

src/test/ui/borrowck/issue-81365-6.stderr

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ LL | first;
99
| ----- borrow later used here
1010
|
1111
= note: borrow occurs due to deref coercion to `[()]`
12+
note: deref defined here
13+
--> $DIR/issue-81365-6.rs:9:5
14+
|
15+
LL | type Target = [()];
16+
| ^^^^^^^^^^^^^^^^^^^
1217

1318
error: aborting due to previous error
1419

src/test/ui/borrowck/issue-81365-7.stderr

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ LL | first;
99
| ----- borrow later used here
1010
|
1111
= note: borrow occurs due to deref coercion to `DerefTarget`
12+
note: deref defined here
13+
--> $DIR/issue-81365-7.rs:12:5
14+
|
15+
LL | type Target = DerefTarget;
16+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
1217

1318
error: aborting due to previous error
1419

src/test/ui/borrowck/issue-81365-8.stderr

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ LL | first;
99
| ----- borrow later used here
1010
|
1111
= note: borrow occurs due to deref coercion to `DerefTarget`
12+
note: deref defined here
13+
--> $DIR/issue-81365-8.rs:12:5
14+
|
15+
LL | type Target = DerefTarget;
16+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
1217

1318
error: aborting due to previous error
1419

0 commit comments

Comments
 (0)