Shorten def_span for more items.

7 files changed, 36 insertions, 53 deletions

diff --git a/src/test/ui/layout/debug.stderr b/src/test/ui/layout/debug.stderr
index 7dbcc151855..7ba9657fcd6 100644
--- a/src/test/ui/layout/debug.stderr
+++ b/src/test/ui/layout/debug.stderr
@@ -84,7 +84,7 @@ error: layout_of(E) = Layout {
   --> $DIR/debug.rs:6:1
    |
 LL | enum E { Foo, Bar(!, i32, i32) }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^
 
 error: layout_of(S) = Layout {
            fields: Arbitrary {
@@ -128,7 +128,7 @@ error: layout_of(S) = Layout {
   --> $DIR/debug.rs:9:1
    |
 LL | struct S { f1: i32, f2: (), f3: i32 }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^
 
 error: layout_of(U) = Layout {
            fields: Union(
@@ -150,7 +150,7 @@ error: layout_of(U) = Layout {
   --> $DIR/debug.rs:12:1
    |
 LL | union U { f1: (i32, i32), f3: i32 }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^
 
 error: layout_of(std::result::Result<i32, i32>) = Layout {
            fields: Arbitrary {
@@ -279,7 +279,7 @@ error: layout_of(std::result::Result<i32, i32>) = Layout {
   --> $DIR/debug.rs:15:1
    |
 LL | type Test = Result<i32, i32>;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^
 
 error: layout_of(i32) = Layout {
            fields: Primitive,
@@ -305,7 +305,7 @@ error: layout_of(i32) = Layout {
   --> $DIR/debug.rs:18:1
    |
 LL | type T = impl std::fmt::Debug;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/layout/hexagon-enum.stderr b/src/test/ui/layout/hexagon-enum.stderr
index ba919df771f..f3123cb0ad2 100644
--- a/src/test/ui/layout/hexagon-enum.stderr
+++ b/src/test/ui/layout/hexagon-enum.stderr
@@ -66,7 +66,7 @@ error: layout_of(A) = Layout {
   --> $DIR/hexagon-enum.rs:16:1
    |
 LL | enum A { Apple }
-   | ^^^^^^^^^^^^^^^^
+   | ^^^^^^
 
 error: layout_of(B) = Layout {
            fields: Arbitrary {
@@ -136,7 +136,7 @@ error: layout_of(B) = Layout {
   --> $DIR/hexagon-enum.rs:20:1
    |
 LL | enum B { Banana = 255, }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^
 
 error: layout_of(C) = Layout {
            fields: Arbitrary {
@@ -206,7 +206,7 @@ error: layout_of(C) = Layout {
   --> $DIR/hexagon-enum.rs:24:1
    |
 LL | enum C { Chaenomeles = 256, }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^
 
 error: layout_of(P) = Layout {
            fields: Arbitrary {
@@ -276,7 +276,7 @@ error: layout_of(P) = Layout {
   --> $DIR/hexagon-enum.rs:28:1
    |
 LL | enum P { Peach = 0x1000_0000isize, }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^
 
 error: layout_of(T) = Layout {
            fields: Arbitrary {
@@ -346,7 +346,7 @@ error: layout_of(T) = Layout {
   --> $DIR/hexagon-enum.rs:34:1
    |
 LL | enum T { Tangerine = TANGERINE as isize }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.stderr b/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.stderr
index 6c97a09b0c6..e19216a99db 100644
--- a/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.stderr
+++ b/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.stderr
@@ -2,13 +2,13 @@ error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 byt
   --> $DIR/homogeneous-aggr-zero-sized-c-struct.rs:22:1
    |
 LL | pub type TestMiddle = Middle;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^
 
 error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
   --> $DIR/homogeneous-aggr-zero-sized-c-struct.rs:33:1
    |
 LL | pub type TestFinal = Final;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.stderr b/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.stderr
index 322948ff783..17d639da024 100644
--- a/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.stderr
+++ b/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.stderr
@@ -2,31 +2,31 @@ error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 byt
   --> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:53:1
    |
 LL | pub type Test1 = BaseCase;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^
 
 error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
   --> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:57:1
    |
 LL | pub type Test2 = WithPhantomData;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^
 
 error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
   --> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:61:1
    |
 LL | pub type Test3 = WithEmptyRustStruct;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^
 
 error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
   --> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:65:1
    |
 LL | pub type Test4 = WithTransitivelyEmptyRustStruct;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^
 
 error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
   --> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:69:1
    |
 LL | pub type Test5 = WithEmptyRustEnum;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr b/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr
index 33dfa307c1d..84d8bc799b9 100644
--- a/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr
+++ b/src/test/ui/layout/issue-96158-scalarpair-payload-might-be-uninit.stderr
@@ -105,11 +105,8 @@ error: layout_of(MissingPayloadField) = Layout {
        }
   --> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:16:1
    |
-LL | / pub enum MissingPayloadField {
-LL | |     Some(u8),
-LL | |     None
-LL | | }
-   | |_^
+LL | pub enum MissingPayloadField {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: layout_of(CommonPayloadField) = Layout {
            fields: Arbitrary {
@@ -237,11 +234,8 @@ error: layout_of(CommonPayloadField) = Layout {
        }
   --> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:25:1
    |
-LL | / pub enum CommonPayloadField {
-LL | |     A(u8),
-LL | |     B(u8),
-LL | | }
-   | |_^
+LL | pub enum CommonPayloadField {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
            fields: Arbitrary {
@@ -366,11 +360,8 @@ error: layout_of(CommonPayloadFieldIsMaybeUninit) = Layout {
        }
   --> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:33:1
    |
-LL | / pub enum CommonPayloadFieldIsMaybeUninit {
-LL | |     A(u8),
-LL | |     B(MaybeUninit<u8>),
-LL | | }
-   | |_^
+LL | pub enum CommonPayloadFieldIsMaybeUninit {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: layout_of(NicheFirst) = Layout {
            fields: Arbitrary {
@@ -513,12 +504,8 @@ error: layout_of(NicheFirst) = Layout {
        }
   --> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:41:1
    |
-LL | / pub enum NicheFirst {
-LL | |     A(HasNiche, u8),
-LL | |     B,
-LL | |     C
-LL | | }
-   | |_^
+LL | pub enum NicheFirst {
+   | ^^^^^^^^^^^^^^^^^^^
 
 error: layout_of(NicheSecond) = Layout {
            fields: Arbitrary {
@@ -661,12 +648,8 @@ error: layout_of(NicheSecond) = Layout {
        }
   --> $DIR/issue-96158-scalarpair-payload-might-be-uninit.rs:50:1
    |
-LL | / pub enum NicheSecond {
-LL | |     A(u8, HasNiche),
-LL | |     B,
-LL | |     C,
-LL | | }
-   | |_^
+LL | pub enum NicheSecond {
+   | ^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/layout/thumb-enum.stderr b/src/test/ui/layout/thumb-enum.stderr
index 9db9ad5a784..e6ed626d5f1 100644
--- a/src/test/ui/layout/thumb-enum.stderr
+++ b/src/test/ui/layout/thumb-enum.stderr
@@ -66,7 +66,7 @@ error: layout_of(A) = Layout {
   --> $DIR/thumb-enum.rs:16:1
    |
 LL | enum A { Apple }
-   | ^^^^^^^^^^^^^^^^
+   | ^^^^^^
 
 error: layout_of(B) = Layout {
            fields: Arbitrary {
@@ -136,7 +136,7 @@ error: layout_of(B) = Layout {
   --> $DIR/thumb-enum.rs:20:1
    |
 LL | enum B { Banana = 255, }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^
 
 error: layout_of(C) = Layout {
            fields: Arbitrary {
@@ -206,7 +206,7 @@ error: layout_of(C) = Layout {
   --> $DIR/thumb-enum.rs:24:1
    |
 LL | enum C { Chaenomeles = 256, }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^
 
 error: layout_of(P) = Layout {
            fields: Arbitrary {
@@ -276,7 +276,7 @@ error: layout_of(P) = Layout {
   --> $DIR/thumb-enum.rs:28:1
    |
 LL | enum P { Peach = 0x1000_0000isize, }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^
 
 error: layout_of(T) = Layout {
            fields: Arbitrary {
@@ -346,7 +346,7 @@ error: layout_of(T) = Layout {
   --> $DIR/thumb-enum.rs:34:1
    |
 LL | enum T { Tangerine = TANGERINE as isize }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/layout/zero-sized-array-union.stderr b/src/test/ui/layout/zero-sized-array-union.stderr
index 8faf8593294..de2b863e4ca 100644
--- a/src/test/ui/layout/zero-sized-array-union.stderr
+++ b/src/test/ui/layout/zero-sized-array-union.stderr
@@ -2,25 +2,25 @@ error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 byt
   --> $DIR/zero-sized-array-union.rs:59:1
    |
 LL | type TestBaz1 = Baz1;
-   | ^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^
 
 error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
   --> $DIR/zero-sized-array-union.rs:70:1
    |
 LL | type TestBaz2 = Baz2;
-   | ^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^
 
 error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
   --> $DIR/zero-sized-array-union.rs:81:1
    |
 LL | type TestBaz3 = Baz3;
-   | ^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^
 
 error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size(4 bytes) }))
   --> $DIR/zero-sized-array-union.rs:92:1
    |
 LL | type TestBaz4 = Baz4;
-   | ^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^
 
 error: aborting due to 4 previous errors