Remove CallKind::Deref hack from UseSpans

compiler-errors · compiler-errors · commit 339902908eba · 2025-01-06T03:55:19.000Z
It's not really necessary
diff --git a/compiler/rustc_borrowck/src/diagnostics/mod.rs b/compiler/rustc_borrowck/src/diagnostics/mod.rs
@@ -661,9 +661,6 @@ impl UseSpans<'_> {
             UseSpans::ClosureUse { args_span: span, .. }
             | UseSpans::PatUse(span)
             | UseSpans::OtherUse(span) => span,
-            UseSpans::FnSelfUse { fn_call_span, kind: CallKind::DerefCoercion { .. }, .. } => {
-                fn_call_span
-            }
             UseSpans::FnSelfUse { var_span, .. } => var_span,
         }
     }
@@ -674,9 +671,6 @@ impl UseSpans<'_> {
             UseSpans::ClosureUse { path_span: span, .. }
             | UseSpans::PatUse(span)
             | UseSpans::OtherUse(span) => span,
-            UseSpans::FnSelfUse { fn_call_span, kind: CallKind::DerefCoercion { .. }, .. } => {
-                fn_call_span
-            }
             UseSpans::FnSelfUse { var_span, .. } => var_span,
         }
     }
@@ -687,9 +681,6 @@ impl UseSpans<'_> {
             UseSpans::ClosureUse { capture_kind_span: span, .. }
             | UseSpans::PatUse(span)
             | UseSpans::OtherUse(span) => span,
-            UseSpans::FnSelfUse { fn_call_span, kind: CallKind::DerefCoercion { .. }, .. } => {
-                fn_call_span
-            }
             UseSpans::FnSelfUse { var_span, .. } => var_span,
         }
     }
diff --git a/tests/ui/moves/move-deref-coercion.stderr b/tests/ui/moves/move-deref-coercion.stderr
@@ -4,7 +4,7 @@ error[E0382]: borrow of partially moved value: `val`
 LL |     let _val = val.first;
    |                --------- value partially moved here
 LL |     val.inner;
-   |     ^^^^^^^^^ value borrowed here after partial move
+   |     ^^^ value borrowed here after partial move
    |
    = note: partial move occurs because `val.first` has type `NotCopy`, which does not implement the `Copy` trait
    = note: borrow occurs due to deref coercion to `NotCopy`
@@ -20,7 +20,7 @@ error[E0382]: borrow of partially moved value: `val`
 LL |     let _val = val.first;
    |                --------- value partially moved here
 LL |     val.inner_method();
-   |     ^^^^^^^^^^^^^^^^^^ value borrowed here after partial move
+   |     ^^^ value borrowed here after partial move
    |
    = note: partial move occurs because `val.first` has type `NotCopy`, which does not implement the `Copy` trait
    = note: borrow occurs due to deref coercion to `NotCopy`
diff --git a/tests/ui/no-capture-arc.stderr b/tests/ui/no-capture-arc.stderr
@@ -1,5 +1,5 @@
 error[E0382]: borrow of moved value: `arc_v`
-  --> $DIR/no-capture-arc.rs:14:16
+  --> $DIR/no-capture-arc.rs:14:18
    |
 LL |     let arc_v = Arc::new(v);
    |         ----- move occurs because `arc_v` has type `Arc<Vec<i32>>`, which does not implement the `Copy` trait
@@ -10,7 +10,7 @@ LL |         assert_eq!((*arc_v)[3], 4);
    |                      ----- variable moved due to use in closure
 ...
 LL |     assert_eq!((*arc_v)[2], 3);
-   |                ^^^^^^^^ value borrowed here after move
+   |                  ^^^^^ value borrowed here after move
    |
    = note: borrow occurs due to deref coercion to `Vec<i32>`
 
diff --git a/tests/ui/no-reuse-move-arc.stderr b/tests/ui/no-reuse-move-arc.stderr
@@ -1,5 +1,5 @@
 error[E0382]: borrow of moved value: `arc_v`
-  --> $DIR/no-reuse-move-arc.rs:12:16
+  --> $DIR/no-reuse-move-arc.rs:12:18
    |
 LL |     let arc_v = Arc::new(v);
    |         ----- move occurs because `arc_v` has type `Arc<Vec<i32>>`, which does not implement the `Copy` trait
@@ -10,7 +10,7 @@ LL |         assert_eq!((*arc_v)[3], 4);
    |                      ----- variable moved due to use in closure
 ...
 LL |     assert_eq!((*arc_v)[2], 3);
-   |                ^^^^^^^^ value borrowed here after move
+   |                  ^^^^^ value borrowed here after move
    |
    = note: borrow occurs due to deref coercion to `Vec<i32>`
 

Original file line number	Diff line number	Diff line change
`@@ -661,9 +661,6 @@ impl UseSpans<'_> {`
`661`	`661`	`UseSpans::ClosureUse { args_span: span, .. }`
`662`	`662`	`\| UseSpans::PatUse(span)`
`663`	`663`	`\| UseSpans::OtherUse(span) => span,`
`664`		`- UseSpans::FnSelfUse { fn_call_span, kind: CallKind::DerefCoercion { .. }, .. } => {`
`665`		`- fn_call_span`
`666`		`- }`
`667`	`664`	`UseSpans::FnSelfUse { var_span, .. } => var_span,`
`668`	`665`	`}`
`669`	`666`	`}`
`@@ -674,9 +671,6 @@ impl UseSpans<'_> {`
`674`	`671`	`UseSpans::ClosureUse { path_span: span, .. }`
`675`	`672`	`\| UseSpans::PatUse(span)`
`676`	`673`	`\| UseSpans::OtherUse(span) => span,`
`677`		`- UseSpans::FnSelfUse { fn_call_span, kind: CallKind::DerefCoercion { .. }, .. } => {`
`678`		`- fn_call_span`
`679`		`- }`
`680`	`674`	`UseSpans::FnSelfUse { var_span, .. } => var_span,`
`681`	`675`	`}`
`682`	`676`	`}`
`@@ -687,9 +681,6 @@ impl UseSpans<'_> {`
`687`	`681`	`UseSpans::ClosureUse { capture_kind_span: span, .. }`
`688`	`682`	`\| UseSpans::PatUse(span)`
`689`	`683`	`\| UseSpans::OtherUse(span) => span,`
`690`		`- UseSpans::FnSelfUse { fn_call_span, kind: CallKind::DerefCoercion { .. }, .. } => {`
`691`		`- fn_call_span`
`692`		`- }`
`693`	`684`	`UseSpans::FnSelfUse { var_span, .. } => var_span,`
`694`	`685`	`}`
`695`	`686`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error[E0382]: borrow of moved value: `arc_v`
`2`		`- --> $DIR/no-capture-arc.rs:14:16`
	`2`	`+ --> $DIR/no-capture-arc.rs:14:18`
`3`	`3`	`\|`
`4`	`4`	`LL \| let arc_v = Arc::new(v);`
`5`	`5`	\| ----- move occurs because `arc_v` has type `Arc<Vec<i32>>`, which does not implement the `Copy` trait
`@@ -10,7 +10,7 @@ LL \| assert_eq!((*arc_v)[3], 4);`
`10`	`10`	`\| ----- variable moved due to use in closure`
`11`	`11`	`...`
`12`	`12`	`LL \| assert_eq!((*arc_v)[2], 3);`
`13`		`- \| ^^^^^^^^ value borrowed here after move`
	`13`	`+ \| ^^^^^ value borrowed here after move`
`14`	`14`	`\|`
`15`	`15`	= note: borrow occurs due to deref coercion to `Vec<i32>`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error[E0382]: borrow of moved value: `arc_v`
`2`		`- --> $DIR/no-reuse-move-arc.rs:12:16`
	`2`	`+ --> $DIR/no-reuse-move-arc.rs:12:18`
`3`	`3`	`\|`
`4`	`4`	`LL \| let arc_v = Arc::new(v);`
`5`	`5`	\| ----- move occurs because `arc_v` has type `Arc<Vec<i32>>`, which does not implement the `Copy` trait
`@@ -10,7 +10,7 @@ LL \| assert_eq!((*arc_v)[3], 4);`
`10`	`10`	`\| ----- variable moved due to use in closure`
`11`	`11`	`...`
`12`	`12`	`LL \| assert_eq!((*arc_v)[2], 3);`
`13`		`- \| ^^^^^^^^ value borrowed here after move`
	`13`	`+ \| ^^^^^ value borrowed here after move`
`14`	`14`	`\|`
`15`	`15`	= note: borrow occurs due to deref coercion to `Vec<i32>`
`16`	`16`