Tweak "unecessary unsafe block" error spans

1 files changed, 22 insertions, 65 deletions

diff --git a/src/test/ui/span/lint-unused-unsafe.stderr b/src/test/ui/span/lint-unused-unsafe.stderr
index f4998e08907..8a8b104098e 100644
--- a/src/test/ui/span/lint-unused-unsafe.stderr
+++ b/src/test/ui/span/lint-unused-unsafe.stderr
@@ -2,7 +2,7 @@ error: unnecessary `unsafe` block
   --> $DIR/lint-unused-unsafe.rs:26:13
    |
 26 | fn bad1() { unsafe {} }                  //~ ERROR: unnecessary `unsafe` block
-   |             ^^^^^^^^^ unnecessary `unsafe` block
+   |             ^^^^^^ unnecessary `unsafe` block
    |
 note: lint level defined here
   --> $DIR/lint-unused-unsafe.rs:14:9
@@ -14,97 +14,54 @@ error: unnecessary `unsafe` block
   --> $DIR/lint-unused-unsafe.rs:27:13
    |
 27 | fn bad2() { unsafe { bad1() } }          //~ ERROR: unnecessary `unsafe` block
-   |             ^^^^^^^^^^^^^^^^^ unnecessary `unsafe` block
+   |             ^^^^^^ unnecessary `unsafe` block
 
 error: unnecessary `unsafe` block
   --> $DIR/lint-unused-unsafe.rs:28:20
    |
 28 | unsafe fn bad3() { unsafe {} }           //~ ERROR: unnecessary `unsafe` block
-   |                    ^^^^^^^^^ unnecessary `unsafe` block
-   |
-note: because it's nested under this `unsafe` fn
-  --> $DIR/lint-unused-unsafe.rs:28:1
-   |
-28 | unsafe fn bad3() { unsafe {} }           //~ ERROR: unnecessary `unsafe` block
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ----------------   ^^^^^^ unnecessary `unsafe` block
+   | |
+   | because it's nested under this `unsafe` fn
 
 error: unnecessary `unsafe` block
   --> $DIR/lint-unused-unsafe.rs:29:13
    |
 29 | fn bad4() { unsafe { callback(||{}) } }  //~ ERROR: unnecessary `unsafe` block
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^ unnecessary `unsafe` block
+   |             ^^^^^^ unnecessary `unsafe` block
 
 error: unnecessary `unsafe` block
   --> $DIR/lint-unused-unsafe.rs:30:20
    |
 30 | unsafe fn bad5() { unsafe { unsf() } }   //~ ERROR: unnecessary `unsafe` block
-   |                    ^^^^^^^^^^^^^^^^^ unnecessary `unsafe` block
-   |
-note: because it's nested under this `unsafe` fn
-  --> $DIR/lint-unused-unsafe.rs:30:1
-   |
-30 | unsafe fn bad5() { unsafe { unsf() } }   //~ ERROR: unnecessary `unsafe` block
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ----------------   ^^^^^^ unnecessary `unsafe` block
+   | |
+   | because it's nested under this `unsafe` fn
 
 error: unnecessary `unsafe` block
   --> $DIR/lint-unused-unsafe.rs:33:9
    |
-33 | /         unsafe {                         //~ ERROR: unnecessary `unsafe` block
-34 | |             unsf()
-35 | |         }
-   | |_________^ unnecessary `unsafe` block
-   |
-note: because it's nested under this `unsafe` block
-  --> $DIR/lint-unused-unsafe.rs:32:5
-   |
-32 | /     unsafe {                             // don't put the warning here
-33 | |         unsafe {                         //~ ERROR: unnecessary `unsafe` block
-34 | |             unsf()
-35 | |         }
-36 | |     }
-   | |_____^
+32 |     unsafe {                             // don't put the warning here
+   |     ------ because it's nested under this `unsafe` block
+33 |         unsafe {                         //~ ERROR: unnecessary `unsafe` block
+   |         ^^^^^^ unnecessary `unsafe` block
 
 error: unnecessary `unsafe` block
   --> $DIR/lint-unused-unsafe.rs:39:5
    |
-39 | /     unsafe {                             //~ ERROR: unnecessary `unsafe` block
-40 | |         unsafe {                         //~ ERROR: unnecessary `unsafe` block
-41 | |             unsf()
-42 | |         }
-43 | |     }
-   | |_____^ unnecessary `unsafe` block
-   |
-note: because it's nested under this `unsafe` fn
-  --> $DIR/lint-unused-unsafe.rs:38:1
-   |
-38 | / unsafe fn bad7() {
-39 | |     unsafe {                             //~ ERROR: unnecessary `unsafe` block
-40 | |         unsafe {                         //~ ERROR: unnecessary `unsafe` block
-41 | |             unsf()
-42 | |         }
-43 | |     }
-44 | | }
-   | |_^
+38 | unsafe fn bad7() {
+   | ---------------- because it's nested under this `unsafe` fn
+39 |     unsafe {                             //~ ERROR: unnecessary `unsafe` block
+   |     ^^^^^^ unnecessary `unsafe` block
 
 error: unnecessary `unsafe` block
   --> $DIR/lint-unused-unsafe.rs:40:9
    |
-40 | /         unsafe {                         //~ ERROR: unnecessary `unsafe` block
-41 | |             unsf()
-42 | |         }
-   | |_________^ unnecessary `unsafe` block
-   |
-note: because it's nested under this `unsafe` fn
-  --> $DIR/lint-unused-unsafe.rs:38:1
-   |
-38 | / unsafe fn bad7() {
-39 | |     unsafe {                             //~ ERROR: unnecessary `unsafe` block
-40 | |         unsafe {                         //~ ERROR: unnecessary `unsafe` block
-41 | |             unsf()
-42 | |         }
-43 | |     }
-44 | | }
-   | |_^
+38 | unsafe fn bad7() {
+   | ---------------- because it's nested under this `unsafe` fn
+39 |     unsafe {                             //~ ERROR: unnecessary `unsafe` block
+40 |         unsafe {                         //~ ERROR: unnecessary `unsafe` block
+   |         ^^^^^^ unnecessary `unsafe` block
 
 error: aborting due to 8 previous errors