use named_span in case of tuple variant

TaKO8Ki · TaKO8Ki · commit 0541b4e03469 · 2022-07-06T19:09:50.000+09:00
diff --git a/compiler/rustc_middle/src/hir/map/mod.rs b/compiler/rustc_middle/src/hir/map/mod.rs
@@ -1012,12 +1012,7 @@ impl<'hir> Map<'hir> {
                 ItemKind::Use(path, _) => path.span,
                 _ => named_span(item.span, item.ident, item.kind.generics()),
             },
-            Node::Variant(variant) => match variant.data {
-                VariantData::Struct(..) | VariantData::Unit(..) => {
-                    named_span(variant.span, variant.ident, None)
-                }
-                VariantData::Tuple(..) => variant.span,
-            },
+            Node::Variant(variant) => named_span(variant.span, variant.ident, None),
             Node::ImplItem(item) => named_span(item.span, item.ident, Some(item.generics)),
             Node::ForeignItem(item) => match item.kind {
                 ForeignItemKind::Fn(decl, _, _) => until_within(item.span, decl.output.span()),
diff --git a/compiler/rustc_trait_selection/src/traits/specialize/mod.rs b/compiler/rustc_trait_selection/src/traits/specialize/mod.rs
@@ -341,7 +341,7 @@ fn report_negative_positive_conflict(
     positive_impl_def_id: DefId,
     sg: &mut specialization_graph::Graph,
 ) {
-    let impl_span = tcx.span_of_impl(local_impl_def_id.to_def_id()).unwrap();
+    let impl_span = tcx.def_span(local_impl_def_id);
 
     let mut err = struct_span_err!(
         tcx.sess,
diff --git a/src/test/ui/empty/empty-struct-braces-pat-3.stderr b/src/test/ui/empty/empty-struct-braces-pat-3.stderr
@@ -19,7 +19,7 @@ LL |     XEmpty3 {},
    |     ------- `XE::XEmpty3` defined here
 LL |     XEmpty4,
 LL |     XEmpty5(),
-   |     --------- similarly named tuple variant `XEmpty5` defined here
+   |     ------- similarly named tuple variant `XEmpty5` defined here
    |
 help: use struct pattern syntax instead
    |
@@ -51,7 +51,7 @@ LL |     XEmpty3 {},
    |     ------- `XE::XEmpty3` defined here
 LL |     XEmpty4,
 LL |     XEmpty5(),
-   |     --------- similarly named tuple variant `XEmpty5` defined here
+   |     ------- similarly named tuple variant `XEmpty5` defined here
    |
 help: use struct pattern syntax instead
    |
diff --git a/src/test/ui/empty/empty-struct-tuple-pat.stderr b/src/test/ui/empty/empty-struct-tuple-pat.stderr
@@ -36,7 +36,7 @@ LL |         XE::XEmpty5 => (),
 LL |     XEmpty4,
    |     ------- similarly named unit variant `XEmpty4` defined here
 LL |     XEmpty5(),
-   |     --------- `XE::XEmpty5` defined here
+   |     ------- `XE::XEmpty5` defined here
    |
 help: use the tuple variant pattern syntax instead
    |
diff --git a/src/test/ui/empty/empty-struct-unit-pat.stderr b/src/test/ui/empty/empty-struct-unit-pat.stderr
@@ -108,7 +108,7 @@ LL |         XE::XEmpty4() => (),
 LL |     XEmpty4,
    |     ------- `XE::XEmpty4` defined here
 LL |     XEmpty5(),
-   |     --------- similarly named tuple variant `XEmpty5` defined here
+   |     ------- similarly named tuple variant `XEmpty5` defined here
    |
 help: use this syntax instead
    |
@@ -139,7 +139,7 @@ LL |         XE::XEmpty4(..) => (),
 LL |     XEmpty4,
    |     ------- `XE::XEmpty4` defined here
 LL |     XEmpty5(),
-   |     --------- similarly named tuple variant `XEmpty5` defined here
+   |     ------- similarly named tuple variant `XEmpty5` defined here
    |
 help: use this syntax instead
    |
diff --git a/src/test/ui/mismatched_types/issue-47706.stderr b/src/test/ui/mismatched_types/issue-47706.stderr
@@ -19,7 +19,7 @@ error[E0593]: function is expected to take 0 arguments, but it takes 1 argument
   --> $DIR/issue-47706.rs:27:9
    |
 LL |     Bar(i32),
-   |     -------- takes 1 argument
+   |     --- takes 1 argument
 ...
 LL |     foo(Qux::Bar);
    |     --- ^^^^^^^^ expected function that takes 0 arguments
diff --git a/src/test/ui/namespace/namespace-mix.stderr b/src/test/ui/namespace/namespace-mix.stderr
@@ -94,7 +94,7 @@ LL |     check(xm7::V);
 LL |         V {},
    |         - `xm7::V` defined here
 LL |         TV(),
-   |         ---- similarly named tuple variant `TV` defined here
+   |         -- similarly named tuple variant `TV` defined here
    |
 help: use struct literal syntax instead
    |
diff --git a/src/test/ui/pattern/pat-tuple-field-count-cross.stderr b/src/test/ui/pattern/pat-tuple-field-count-cross.stderr
@@ -60,7 +60,7 @@ LL |         E1::Z0() => {}
   ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:11:15
    |
 LL | pub enum E1 { Z0, Z1(), S(u8, u8, u8) }
-   |               --  ---- similarly named tuple variant `Z1` defined here
+   |               --  -- similarly named tuple variant `Z1` defined here
    |               |
    |               `E1::Z0` defined here
    |
@@ -82,7 +82,7 @@ LL |         E1::Z0(x) => {}
   ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:11:15
    |
 LL | pub enum E1 { Z0, Z1(), S(u8, u8, u8) }
-   |               --  ---- similarly named tuple variant `Z1` defined here
+   |               --  -- similarly named tuple variant `Z1` defined here
    |               |
    |               `E1::Z0` defined here
    |
@@ -104,7 +104,7 @@ LL |         E1::Z1 => {}
   ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:11:19
    |
 LL | pub enum E1 { Z0, Z1(), S(u8, u8, u8) }
-   |               --  ---- `E1::Z1` defined here
+   |               --  -- `E1::Z1` defined here
    |               |
    |               similarly named unit variant `Z0` defined here
    |
@@ -295,7 +295,7 @@ LL |         E1::Z1(x) => {}
   ::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:11:19
    |
 LL | pub enum E1 { Z0, Z1(), S(u8, u8, u8) }
-   |                   ---- tuple variant has 0 fields
+   |                   -- tuple variant has 0 fields
 
 error[E0023]: this pattern has 0 fields, but the corresponding tuple variant has 3 fields
   --> $DIR/pat-tuple-field-count-cross.rs:39:9
diff --git a/src/test/ui/pattern/pat-tuple-overfield.stderr b/src/test/ui/pattern/pat-tuple-overfield.stderr
@@ -289,7 +289,7 @@ error[E0023]: this pattern has 1 field, but the corresponding tuple variant has
   --> $DIR/pat-tuple-overfield.rs:71:16
    |
 LL |     Z1(),
-   |     ---- tuple variant has 0 fields
+   |     -- tuple variant has 0 fields
 ...
 LL |         E1::Z1(_) => {}
    |                ^ expected 0 fields, found 1
@@ -298,7 +298,7 @@ error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has
   --> $DIR/pat-tuple-overfield.rs:72:16
    |
 LL |     Z1(),
-   |     ---- tuple variant has 0 fields
+   |     -- tuple variant has 0 fields
 ...
 LL |         E1::Z1(_, _) => {}
    |                ^  ^ expected 0 fields, found 2
diff --git a/src/test/ui/proc-macro/parent-source-spans.stderr b/src/test/ui/proc-macro/parent-source-spans.stderr
@@ -148,7 +148,7 @@ LL |     one!("hello", "world");
   ::: $SRC_DIR/core/src/result.rs:LL:COL
    |
 LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     --------------------------------------------------- similarly named tuple variant `Ok` defined here
+   |     -- similarly named tuple variant `Ok` defined here
    |
    = note: this error originates in the macro `parent_source_spans` (in Nightly builds, run with -Z macro-backtrace for more info)
 
@@ -164,7 +164,7 @@ LL |     two!("yay", "rust");
   ::: $SRC_DIR/core/src/result.rs:LL:COL
    |
 LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     --------------------------------------------------- similarly named tuple variant `Ok` defined here
+   |     -- similarly named tuple variant `Ok` defined here
    |
    = note: this error originates in the macro `parent_source_spans` (in Nightly builds, run with -Z macro-backtrace for more info)
 
@@ -180,7 +180,7 @@ LL |     three!("hip", "hop");
   ::: $SRC_DIR/core/src/result.rs:LL:COL
    |
 LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     --------------------------------------------------- similarly named tuple variant `Ok` defined here
+   |     -- similarly named tuple variant `Ok` defined here
    |
    = note: this error originates in the macro `parent_source_spans` (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/src/test/ui/repr/repr-transparent.stderr b/src/test/ui/repr/repr-transparent.stderr
@@ -58,7 +58,7 @@ error[E0731]: transparent enum needs exactly one variant, but has 2
 LL | enum MultipleVariants {
    | ^^^^^^^^^^^^^^^^^^^^^ needs exactly one variant, but has 2
 LL |     Foo(String),
-   |     -----------
+   |     ---
 LL |     Bar,
    |     --- too many variants in `MultipleVariants`
 
diff --git a/src/test/ui/resolve/privacy-enum-ctor.stderr b/src/test/ui/resolve/privacy-enum-ctor.stderr
@@ -318,7 +318,7 @@ error[E0308]: mismatched types
   --> $DIR/privacy-enum-ctor.rs:27:20
    |
 LL |             Fn(u8),
-   |             ------ fn(u8) -> Z {Z::Fn} defined here
+   |             -- fn(u8) -> Z {Z::Fn} defined here
 ...
 LL |         let _: Z = Z::Fn;
    |                -   ^^^^^ expected enum `Z`, found fn item
@@ -353,7 +353,7 @@ error[E0308]: mismatched types
   --> $DIR/privacy-enum-ctor.rs:43:16
    |
 LL |         Fn(u8),
-   |         ------ fn(u8) -> E {E::Fn} defined here
+   |         -- fn(u8) -> E {E::Fn} defined here
 ...
 LL |     let _: E = m::E::Fn;
    |            -   ^^^^^^^^ expected enum `E`, found fn item
@@ -388,7 +388,7 @@ error[E0308]: mismatched types
   --> $DIR/privacy-enum-ctor.rs:51:16
    |
 LL |         Fn(u8),
-   |         ------ fn(u8) -> E {E::Fn} defined here
+   |         -- fn(u8) -> E {E::Fn} defined here
 ...
 LL |     let _: E = E::Fn;
    |            -   ^^^^^ expected enum `E`, found fn item
diff --git a/src/test/ui/rfc-2008-non-exhaustive/variant.stderr b/src/test/ui/rfc-2008-non-exhaustive/variant.stderr
@@ -8,7 +8,7 @@ note: the tuple variant `Tuple` is defined here
   --> $DIR/auxiliary/variants.rs:5:23
    |
 LL |     #[non_exhaustive] Tuple(u32),
-   |                       ^^^^^^^^^^
+   |                       ^^^^^
 
 error[E0603]: unit variant `Unit` is private
   --> $DIR/variant.rs:14:47
@@ -44,7 +44,7 @@ note: the tuple variant `Tuple` is defined here
   --> $DIR/auxiliary/variants.rs:5:23
    |
 LL |     #[non_exhaustive] Tuple(u32),
-   |                       ^^^^^^^^^^
+   |                       ^^^^^
 
 error[E0603]: tuple variant `Tuple` is private
   --> $DIR/variant.rs:26:35
@@ -56,7 +56,7 @@ note: the tuple variant `Tuple` is defined here
   --> $DIR/auxiliary/variants.rs:5:23
    |
 LL |     #[non_exhaustive] Tuple(u32),
-   |                       ^^^^^^^^^^
+   |                       ^^^^^
 
 error[E0639]: cannot create non-exhaustive variant using struct expression
   --> $DIR/variant.rs:8:26
diff --git a/src/test/ui/suggestions/fn-or-tuple-struct-without-args.stderr b/src/test/ui/suggestions/fn-or-tuple-struct-without-args.stderr
@@ -130,7 +130,7 @@ error[E0308]: mismatched types
   --> $DIR/fn-or-tuple-struct-without-args.rs:35:16
    |
 LL |     A(usize),
-   |     -------- fn(usize) -> E {E::A} defined here
+   |     - fn(usize) -> E {E::A} defined here
 ...
 LL |     let _: E = E::A;
    |            -   ^^^^ expected enum `E`, found fn item

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ LL \| XEmpty3 {},`
`19`	`19`	\| ------- `XE::XEmpty3` defined here
`20`	`20`	`LL \| XEmpty4,`
`21`	`21`	`LL \| XEmpty5(),`
`22`		- \| --------- similarly named tuple variant `XEmpty5` defined here
	`22`	+ \| ------- similarly named tuple variant `XEmpty5` defined here
`23`	`23`	`\|`
`24`	`24`	`help: use struct pattern syntax instead`
`25`	`25`	`\|`
`@@ -51,7 +51,7 @@ LL \| XEmpty3 {},`
`51`	`51`	\| ------- `XE::XEmpty3` defined here
`52`	`52`	`LL \| XEmpty4,`
`53`	`53`	`LL \| XEmpty5(),`
`54`		- \| --------- similarly named tuple variant `XEmpty5` defined here
	`54`	+ \| ------- similarly named tuple variant `XEmpty5` defined here
`55`	`55`	`\|`
`56`	`56`	`help: use struct pattern syntax instead`
`57`	`57`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ LL \| XE::XEmpty5 => (),`
`36`	`36`	`LL \| XEmpty4,`
`37`	`37`	\| ------- similarly named unit variant `XEmpty4` defined here
`38`	`38`	`LL \| XEmpty5(),`
`39`		- \| --------- `XE::XEmpty5` defined here
	`39`	+ \| ------- `XE::XEmpty5` defined here
`40`	`40`	`\|`
`41`	`41`	`help: use the tuple variant pattern syntax instead`
`42`	`42`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ LL \| XE::XEmpty4() => (),`
`108`	`108`	`LL \| XEmpty4,`
`109`	`109`	\| ------- `XE::XEmpty4` defined here
`110`	`110`	`LL \| XEmpty5(),`
`111`		- \| --------- similarly named tuple variant `XEmpty5` defined here
	`111`	+ \| ------- similarly named tuple variant `XEmpty5` defined here
`112`	`112`	`\|`
`113`	`113`	`help: use this syntax instead`
`114`	`114`	`\|`
`@@ -139,7 +139,7 @@ LL \| XE::XEmpty4(..) => (),`
`139`	`139`	`LL \| XEmpty4,`
`140`	`140`	\| ------- `XE::XEmpty4` defined here
`141`	`141`	`LL \| XEmpty5(),`
`142`		- \| --------- similarly named tuple variant `XEmpty5` defined here
	`142`	+ \| ------- similarly named tuple variant `XEmpty5` defined here
`143`	`143`	`\|`
`144`	`144`	`help: use this syntax instead`
`145`	`145`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ error[E0593]: function is expected to take 0 arguments, but it takes 1 argument`
`19`	`19`	`--> $DIR/issue-47706.rs:27:9`
`20`	`20`	`\|`
`21`	`21`	`LL \| Bar(i32),`
`22`		`- \| -------- takes 1 argument`
	`22`	`+ \| --- takes 1 argument`
`23`	`23`	`...`
`24`	`24`	`LL \| foo(Qux::Bar);`
`25`	`25`	`\| --- ^^^^^^^^ expected function that takes 0 arguments`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ LL \| check(xm7::V);`
`94`	`94`	`LL \| V {},`
`95`	`95`	\| - `xm7::V` defined here
`96`	`96`	`LL \| TV(),`
`97`		- \| ---- similarly named tuple variant `TV` defined here
	`97`	+ \| -- similarly named tuple variant `TV` defined here
`98`	`98`	`\|`
`99`	`99`	`help: use struct literal syntax instead`
`100`	`100`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ LL \| E1::Z0() => {}`
`60`	`60`	`::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:11:15`
`61`	`61`	`\|`
`62`	`62`	`LL \| pub enum E1 { Z0, Z1(), S(u8, u8, u8) }`
`63`		- \| -- ---- similarly named tuple variant `Z1` defined here
	`63`	+ \| -- -- similarly named tuple variant `Z1` defined here
`64`	`64`	`\| \|`
`65`	`65`	\| `E1::Z0` defined here
`66`	`66`	`\|`
`@@ -82,7 +82,7 @@ LL \| E1::Z0(x) => {}`
`82`	`82`	`::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:11:15`
`83`	`83`	`\|`
`84`	`84`	`LL \| pub enum E1 { Z0, Z1(), S(u8, u8, u8) }`
`85`		- \| -- ---- similarly named tuple variant `Z1` defined here
	`85`	+ \| -- -- similarly named tuple variant `Z1` defined here
`86`	`86`	`\| \|`
`87`	`87`	\| `E1::Z0` defined here
`88`	`88`	`\|`
`@@ -104,7 +104,7 @@ LL \| E1::Z1 => {}`
`104`	`104`	`::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:11:19`
`105`	`105`	`\|`
`106`	`106`	`LL \| pub enum E1 { Z0, Z1(), S(u8, u8, u8) }`
`107`		- \| -- ---- `E1::Z1` defined here
	`107`	+ \| -- -- `E1::Z1` defined here
`108`	`108`	`\| \|`
`109`	`109`	\| similarly named unit variant `Z0` defined here
`110`	`110`	`\|`
`@@ -295,7 +295,7 @@ LL \| E1::Z1(x) => {}`
`295`	`295`	`::: $DIR/auxiliary/declarations-for-tuple-field-count-errors.rs:11:19`
`296`	`296`	`\|`
`297`	`297`	`LL \| pub enum E1 { Z0, Z1(), S(u8, u8, u8) }`
`298`		`- \| ---- tuple variant has 0 fields`
	`298`	`+ \| -- tuple variant has 0 fields`
`299`	`299`
`300`	`300`	`error[E0023]: this pattern has 0 fields, but the corresponding tuple variant has 3 fields`
`301`	`301`	`--> $DIR/pat-tuple-field-count-cross.rs:39:9`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ LL \| one!("hello", "world");`
`148`	`148`	`::: $SRC_DIR/core/src/result.rs:LL:COL`
`149`	`149`	`\|`
`150`	`150`	`LL \| Ok(#[stable(feature = "rust1", since = "1.0.0")] T),`
`151`		- \| --------------------------------------------------- similarly named tuple variant `Ok` defined here
	`151`	+ \| -- similarly named tuple variant `Ok` defined here
`152`	`152`	`\|`
`153`	`153`	= note: this error originates in the macro `parent_source_spans` (in Nightly builds, run with -Z macro-backtrace for more info)
`154`	`154`
`@@ -164,7 +164,7 @@ LL \| two!("yay", "rust");`
`164`	`164`	`::: $SRC_DIR/core/src/result.rs:LL:COL`
`165`	`165`	`\|`
`166`	`166`	`LL \| Ok(#[stable(feature = "rust1", since = "1.0.0")] T),`
`167`		- \| --------------------------------------------------- similarly named tuple variant `Ok` defined here
	`167`	+ \| -- similarly named tuple variant `Ok` defined here
`168`	`168`	`\|`
`169`	`169`	= note: this error originates in the macro `parent_source_spans` (in Nightly builds, run with -Z macro-backtrace for more info)
`170`	`170`
`@@ -180,7 +180,7 @@ LL \| three!("hip", "hop");`
`180`	`180`	`::: $SRC_DIR/core/src/result.rs:LL:COL`
`181`	`181`	`\|`
`182`	`182`	`LL \| Ok(#[stable(feature = "rust1", since = "1.0.0")] T),`
`183`		- \| --------------------------------------------------- similarly named tuple variant `Ok` defined here
	`183`	+ \| -- similarly named tuple variant `Ok` defined here
`184`	`184`	`\|`
`185`	`185`	= note: this error originates in the macro `parent_source_spans` (in Nightly builds, run with -Z macro-backtrace for more info)
`186`	`186`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ error[E0308]: mismatched types`
`130`	`130`	`--> $DIR/fn-or-tuple-struct-without-args.rs:35:16`
`131`	`131`	`\|`
`132`	`132`	`LL \| A(usize),`
`133`		`- \| -------- fn(usize) -> E {E::A} defined here`
	`133`	`+ \| - fn(usize) -> E {E::A} defined here`
`134`	`134`	`...`
`135`	`135`	`LL \| let _: E = E::A;`
`136`	`136`	\| - ^^^^ expected enum `E`, found fn item