Get span_to_snippet and rewrite it more idiomatically

Kivooeo · Kivooeo · commit a63e3d7b9aa6 · 2025-04-16T22:40:32.000+05:00
diff --git a/tests/ui/issues/issue-11004.stderr b/tests/ui/issues/issue-11004.stderr
@@ -2,29 +2,23 @@ error[E0609]: no field `x` on type `*mut A`
   --> $DIR/issue-11004.rs:7:21
    |
 LL |     let x : i32 = n.x;
-   |                   --^
-   |                   |
-   |                   unknown field access via raw pointer
+   |                     ^ unknown field
    |
-help: use `.` on a dereferenced raw pointer instead
-   |
-LL -     let x : i32 = n.x;
-LL +     let x : i32 = (*n).x;
+help: `n` is a raw pointer; try dereferencing it
    |
+LL |     let x : i32 = (*n).x;
+   |                   ++ +
 
 error[E0609]: no field `y` on type `*mut A`
   --> $DIR/issue-11004.rs:8:21
    |
 LL |     let y : f64 = n.y;
-   |                   --^
-   |                   |
-   |                   unknown field access via raw pointer
-   |
-help: use `.` on a dereferenced raw pointer instead
+   |                     ^ unknown field
    |
-LL -     let y : f64 = n.y;
-LL +     let y : f64 = (*n).y;
+help: `n` is a raw pointer; try dereferencing it
    |
+LL |     let y : f64 = (*n).y;
+   |                   ++ +
 
 error: aborting due to 2 previous errors
 
diff --git a/tests/ui/suggestions/parenthesized-deref-suggestion.stderr b/tests/ui/suggestions/parenthesized-deref-suggestion.stderr
@@ -2,9 +2,7 @@ error[E0609]: no field `opts` on type `*const Session`
   --> $DIR/parenthesized-deref-suggestion.rs:7:30
    |
 LL |     (sess as *const Session).opts;
-   |     -------------------------^^^^
-   |     |
-   |     unknown field access via raw pointer
+   |                              ^^^^ unknown field
    |
 help: `the value` is a raw pointer; try dereferencing it
    |
diff --git a/tests/ui/unsafe/unsafe-fn-autoderef.stderr b/tests/ui/unsafe/unsafe-fn-autoderef.stderr
@@ -2,15 +2,12 @@ error[E0609]: no field `f` on type `*const Rec`
   --> $DIR/unsafe-fn-autoderef.rs:19:14
    |
 LL |     return p.f;
-   |            --^
-   |            |
-   |            unknown field access via raw pointer
+   |              ^ unknown field
    |
-help: use `.` on a dereferenced raw pointer instead
-   |
-LL -     return p.f;
-LL +     return (*p).f;
+help: `p` is a raw pointer; try dereferencing it
    |
+LL |     return (*p).f;
+   |            ++ +
 
 error: aborting due to 1 previous error
 

Original file line number	Diff line number	Diff line change
@@ -2,9 +2,7 @@ error[E0609]: no field `opts` on type `*const Session`
`2`	`2`	`--> $DIR/parenthesized-deref-suggestion.rs:7:30`
`3`	`3`	`\|`
`4`	`4`	`LL \| (sess as *const Session).opts;`
`5`		`- \| -------------------------^^^^`
`6`		`- \| \|`
`7`		`- \| unknown field access via raw pointer`
	`5`	`+ \| ^^^^ unknown field`
`8`	`6`	`\|`
`9`	`7`	help: `the value` is a raw pointer; try dereferencing it
`10`	`8`	`\|`
Original file line number	Diff line number	Diff line change
@@ -2,15 +2,12 @@ error[E0609]: no field `f` on type `*const Rec`
`2`	`2`	`--> $DIR/unsafe-fn-autoderef.rs:19:14`
`3`	`3`	`\|`
`4`	`4`	`LL \| return p.f;`
`5`		`- \| --^`
`6`		`- \| \|`
`7`		`- \| unknown field access via raw pointer`
	`5`	`+ \| ^ unknown field`
`8`	`6`	`\|`
`9`		-help: use `.` on a dereferenced raw pointer instead
`10`		`- \|`
`11`		`-LL - return p.f;`
`12`		`-LL + return (*p).f;`
	`7`	+help: `p` is a raw pointer; try dereferencing it
`13`	`8`	`\|`
	`9`	`+LL \| return (*p).f;`
	`10`	`+ \| ++ +`
`14`	`11`
`15`	`12`	`error: aborting due to 1 previous error`
`16`	`13`