Shorten span for closures.

6 files changed, 36 insertions, 59 deletions

diff --git a/src/test/ui/polymorphization/const_parameters/closures.stderr b/src/test/ui/polymorphization/const_parameters/closures.stderr
index f174215f257..fdf817caea7 100644
--- a/src/test/ui/polymorphization/const_parameters/closures.stderr
+++ b/src/test/ui/polymorphization/const_parameters/closures.stderr
@@ -14,7 +14,7 @@ LL | pub fn unused<const T: usize>() -> usize {
    |               -------------- generic parameter `T` is unused
 LL |
 LL |     let add_one = |x: usize| x + 1;
-   |                   ^^^^^^^^^^^^^^^^
+   |                   ^^^^^^^^^^
 
 error: item has unused generic parameters
   --> $DIR/closures.rs:17:8
@@ -29,7 +29,7 @@ LL | pub fn used_parent<const T: usize>() -> usize {
    |                    -------------- generic parameter `T` is unused
 LL |     let x: usize = T;
 LL |     let add_one = |x: usize| x + 1;
-   |                   ^^^^^^^^^^^^^^^^
+   |                   ^^^^^^^^^^
 
 error: item has unused generic parameters
   --> $DIR/closures.rs:48:13
@@ -38,7 +38,7 @@ LL | pub fn unused_upvar<const T: usize>() -> usize {
    |                     -------------- generic parameter `T` is unused
 LL |     let x: usize = T;
 LL |     let y = || x;
-   |             ^^^^
+   |             ^^
 
 error: aborting due to 4 previous errors; 1 warning emitted
 
diff --git a/src/test/ui/polymorphization/generators.stderr b/src/test/ui/polymorphization/generators.stderr
index 5edbb119f78..a24eee5fed1 100644
--- a/src/test/ui/polymorphization/generators.stderr
+++ b/src/test/ui/polymorphization/generators.stderr
@@ -10,16 +10,12 @@ LL | #![feature(generic_const_exprs, generators, generator_trait, rustc_attrs)]
 error: item has unused generic parameters
   --> $DIR/generators.rs:35:5
    |
-LL |   pub fn unused_type<T>() -> impl Generator<(), Yield = u32, Return = u32> + Unpin {
-   |                      - generic parameter `T` is unused
-LL | /     || {
-LL | |
-LL | |         yield 1;
-LL | |         2
-LL | |     }
-   | |_____^
+LL | pub fn unused_type<T>() -> impl Generator<(), Yield = u32, Return = u32> + Unpin {
+   |                    - generic parameter `T` is unused
+LL |     || {
+   |     ^^
 
-note: the above error was encountered while instantiating `fn finish::<[generator@$DIR/generators.rs:35:5: 39:6], u32, u32>`
+note: the above error was encountered while instantiating `fn finish::<[generator@$DIR/generators.rs:35:5: 35:7], u32, u32>`
   --> $DIR/generators.rs:86:5
    |
 LL |     finish(unused_type::<u32>());
@@ -28,16 +24,12 @@ LL |     finish(unused_type::<u32>());
 error: item has unused generic parameters
   --> $DIR/generators.rs:60:5
    |
-LL |   pub fn unused_const<const T: u32>() -> impl Generator<(), Yield = u32, Return = u32> + Unpin {
-   |                       ------------ generic parameter `T` is unused
-LL | /     || {
-LL | |
-LL | |         yield 1;
-LL | |         2
-LL | |     }
-   | |_____^
+LL | pub fn unused_const<const T: u32>() -> impl Generator<(), Yield = u32, Return = u32> + Unpin {
+   |                     ------------ generic parameter `T` is unused
+LL |     || {
+   |     ^^
 
-note: the above error was encountered while instantiating `fn finish::<[generator@$DIR/generators.rs:60:5: 64:6], u32, u32>`
+note: the above error was encountered while instantiating `fn finish::<[generator@$DIR/generators.rs:60:5: 60:7], u32, u32>`
   --> $DIR/generators.rs:89:5
    |
 LL |     finish(unused_const::<1u32>());
diff --git a/src/test/ui/polymorphization/lifetimes.stderr b/src/test/ui/polymorphization/lifetimes.stderr
index 2020256717c..4773dd4fa2e 100644
--- a/src/test/ui/polymorphization/lifetimes.stderr
+++ b/src/test/ui/polymorphization/lifetimes.stderr
@@ -11,7 +11,7 @@ LL | pub fn used<'a, T: Default>(_: &'a u32) -> u32 {
    |                 - generic parameter `T` is unused
 LL |     let _: T = Default::default();
 LL |     let add_one = |x: u32| x + 1;
-   |                   ^^^^^^^^^^^^^^
+   |                   ^^^^^^^^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/polymorphization/predicates.stderr b/src/test/ui/polymorphization/predicates.stderr
index 6a74e63fdfe..e5af1d7515f 100644
--- a/src/test/ui/polymorphization/predicates.stderr
+++ b/src/test/ui/polymorphization/predicates.stderr
@@ -19,7 +19,7 @@ LL | impl<'a, I, T: 'a, E> Iterator for Foo<'a, I, E>
    |          generic parameter `I` is unused
 ...
 LL |         self.find(|_| true)
-   |                   ^^^^^^^^
+   |                   ^^^
 
 error: item has unused generic parameters
   --> $DIR/predicates.rs:59:4
diff --git a/src/test/ui/polymorphization/type_parameters/closures.stderr b/src/test/ui/polymorphization/type_parameters/closures.stderr
index 417feebbc55..94a4a08bd2f 100644
--- a/src/test/ui/polymorphization/type_parameters/closures.stderr
+++ b/src/test/ui/polymorphization/type_parameters/closures.stderr
@@ -5,7 +5,7 @@ LL | pub fn unused<T>() -> u32 {
    |               - generic parameter `T` is unused
 ...
 LL |     let add_one = |x: u32| x + 1;
-   |                   ^^^^^^^^^^^^^^
+   |                   ^^^^^^^^
 
 error: item has unused generic parameters
   --> $DIR/closures.rs:16:8
@@ -20,7 +20,7 @@ LL | pub fn used_parent<T: Default>() -> u32 {
    |                    - generic parameter `T` is unused
 LL |     let _: T = Default::default();
 LL |     let add_one = |x: u32| x + 1;
-   |                   ^^^^^^^^^^^^^^
+   |                   ^^^^^^^^
 
 error: item has unused generic parameters
   --> $DIR/closures.rs:94:23
@@ -32,7 +32,7 @@ LL |     pub fn unused_all<G: Default>() -> u32 {
    |                       - generic parameter `G` is unused
 LL |
 LL |         let add_one = |x: u32| x + 1;
-   |                       ^^^^^^^^^^^^^^
+   |                       ^^^^^^^^
 
 error: item has unused generic parameters
   --> $DIR/closures.rs:92:12
@@ -46,16 +46,11 @@ LL |     pub fn unused_all<G: Default>() -> u32 {
 error: item has unused generic parameters
   --> $DIR/closures.rs:128:23
    |
-LL |       pub fn used_impl<G: Default>() -> u32 {
-   |                        - generic parameter `G` is unused
+LL |     pub fn used_impl<G: Default>() -> u32 {
+   |                      - generic parameter `G` is unused
 LL |
-LL |           let add_one = |x: u32| {
-   |  _______________________^
-LL | |
-LL | |             let _: F = Default::default();
-LL | |             x + 1
-LL | |         };
-   | |_________^
+LL |         let add_one = |x: u32| {
+   |                       ^^^^^^^^
 
 error: item has unused generic parameters
   --> $DIR/closures.rs:126:12
@@ -66,16 +61,11 @@ LL |     pub fn used_impl<G: Default>() -> u32 {
 error: item has unused generic parameters
   --> $DIR/closures.rs:115:23
    |
-LL |   impl<F: Default> Foo<F> {
-   |        - generic parameter `F` is unused
+LL | impl<F: Default> Foo<F> {
+   |      - generic parameter `F` is unused
 ...
-LL |           let add_one = |x: u32| {
-   |  _______________________^
-LL | |
-LL | |             let _: G = Default::default();
-LL | |             x + 1
-LL | |         };
-   | |_________^
+LL |         let add_one = |x: u32| {
+   |                       ^^^^^^^^
 
 error: item has unused generic parameters
   --> $DIR/closures.rs:113:12
diff --git a/src/test/ui/polymorphization/unsized_cast.stderr b/src/test/ui/polymorphization/unsized_cast.stderr
index b51cc5c719f..27f88d28174 100644
--- a/src/test/ui/polymorphization/unsized_cast.stderr
+++ b/src/test/ui/polymorphization/unsized_cast.stderr
@@ -5,16 +5,16 @@ LL | fn foo<T: Default>() {
    |        - generic parameter `T` is unused
 LL |     let _: T = Default::default();
 LL |     (|| Box::new(|| {}) as Box<dyn Fn()>)();
-   |                  ^^^^^
+   |                  ^^
 
 error: item has unused generic parameters
-  --> $DIR/unsized_cast.rs:11:5
+  --> $DIR/unsized_cast.rs:11:6
    |
 LL | fn foo<T: Default>() {
    |        - generic parameter `T` is unused
 LL |     let _: T = Default::default();
 LL |     (|| Box::new(|| {}) as Box<dyn Fn()>)();
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |      ^^
 
 error: item has unused generic parameters
   --> $DIR/unsized_cast.rs:22:15
@@ -23,21 +23,16 @@ LL | fn foo2<T: Default>() {
    |         - generic parameter `T` is unused
 ...
 LL |         call(&|| {}, ());
-   |               ^^^^^
+   |               ^^
 
 error: item has unused generic parameters
-  --> $DIR/unsized_cast.rs:19:5
+  --> $DIR/unsized_cast.rs:19:6
    |
-LL |   fn foo2<T: Default>() {
-   |           - generic parameter `T` is unused
-LL |       let _: T = Default::default();
-LL | /     (|| {
-LL | |
-LL | |         let call: extern "rust-call" fn(_, _) = Fn::call;
-LL | |         call(&|| {}, ());
-LL | |
-LL | |     })();
-   | |______^
+LL | fn foo2<T: Default>() {
+   |         - generic parameter `T` is unused
+LL |     let _: T = Default::default();
+LL |     (|| {
+   |      ^^
 
 error: aborting due to 4 previous errors