Use more accurate span in resolve_ident_in_lexical_scope

estebank · estebank · commit 48dde00f10d7 · 2025-11-03T16:24:35.000Z
diff --git a/compiler/rustc_resolve/src/ident.rs b/compiler/rustc_resolve/src/ident.rs
@@ -326,7 +326,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                     i,
                     rib_ident,
                     *res,
-                    finalize.map(|finalize| finalize.path_span),
+                    finalize.map(|_| general_span),
                     *original_rib_ident_def,
                     ribs,
                     diag_metadata,
diff --git a/tests/ui/associated-item/associated-item-duplicate-bounds.stderr b/tests/ui/associated-item/associated-item-duplicate-bounds.stderr
@@ -2,7 +2,7 @@ error: generic parameters may not be used in const operations
   --> $DIR/associated-item-duplicate-bounds.rs:7:18
    |
 LL |     links: [u32; A::LINKS], // Shouldn't suggest bounds already there.
-   |                  ^^^^^^^^ cannot perform const operation using `A`
+   |                  ^ cannot perform const operation using `A`
    |
    = note: type parameters may not be used in const expressions
    = help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
diff --git a/tests/ui/delegation/target-expr.stderr b/tests/ui/delegation/target-expr.stderr
@@ -7,7 +7,7 @@ LL |     reuse Trait::static_method {
    |                  ------------- generic parameter used in this inner delegated function
 LL |
 LL |         let _ = T::Default();
-   |                 ^^^^^^^^^^ use of generic parameter from outer item
+   |                 ^ use of generic parameter from outer item
 
 error[E0434]: can't capture dynamic environment in a fn item
   --> $DIR/target-expr.rs:26:17
diff --git a/tests/ui/generics/invalid-type-param-default.stderr b/tests/ui/generics/invalid-type-param-default.stderr
@@ -2,7 +2,7 @@ error[E0128]: generic parameter defaults cannot reference parameters before they
   --> $DIR/invalid-type-param-default.rs:12:12
    |
 LL | fn mdn<T = T::Item>(_: T) {}
-   |            ^^^^^^^ cannot reference `T` before it is declared
+   |            ^ cannot reference `T` before it is declared
 
 error: defaults for generic parameters are not allowed here
   --> $DIR/invalid-type-param-default.rs:7:8
diff --git a/tests/ui/resolve/generic-params-from-outer-item-in-const-item.default.stderr b/tests/ui/resolve/generic-params-from-outer-item-in-const-item.default.stderr
@@ -4,7 +4,7 @@ error[E0401]: can't use generic parameters from outer item
 LL | fn outer<T: Tr>() { // outer function
    |          - type parameter from outer item
 LL |     const K: u32 = T::C;
-   |           -        ^^^^ use of generic parameter from outer item
+   |           -        ^ use of generic parameter from outer item
    |           |
    |           generic parameter used in this inner constant item
    |
@@ -17,7 +17,7 @@ LL | impl<T> Tr for T { // outer impl block
    |      - type parameter from outer item
 LL |     const C: u32 = {
 LL |         const I: u32 = T::C;
-   |               -        ^^^^ use of generic parameter from outer item
+   |               -        ^ use of generic parameter from outer item
    |               |
    |               generic parameter used in this inner constant item
    |
@@ -29,7 +29,7 @@ error[E0401]: can't use generic parameters from outer item
 LL | struct S<T: Tr>(U32<{ // outer struct
    |          - type parameter from outer item
 LL |     const _: u32 = T::C;
-   |           -        ^^^^ use of generic parameter from outer item
+   |           -        ^ use of generic parameter from outer item
    |           |
    |           generic parameter used in this inner constant item
    |
diff --git a/tests/ui/resolve/generic-params-from-outer-item-in-const-item.generic_const_items.stderr b/tests/ui/resolve/generic-params-from-outer-item-in-const-item.generic_const_items.stderr
@@ -4,7 +4,7 @@ error[E0401]: can't use generic parameters from outer item
 LL | fn outer<T: Tr>() { // outer function
    |          - type parameter from outer item
 LL |     const K: u32 = T::C;
-   |           -        ^^^^ use of generic parameter from outer item
+   |           -        ^ use of generic parameter from outer item
    |           |
    |           generic parameter used in this inner constant item
    |
@@ -21,7 +21,7 @@ LL | impl<T> Tr for T { // outer impl block
    |      - type parameter from outer item
 LL |     const C: u32 = {
 LL |         const I: u32 = T::C;
-   |               -        ^^^^ use of generic parameter from outer item
+   |               -        ^ use of generic parameter from outer item
    |               |
    |               generic parameter used in this inner constant item
    |
@@ -37,7 +37,7 @@ error[E0401]: can't use generic parameters from outer item
 LL | struct S<T: Tr>(U32<{ // outer struct
    |          - type parameter from outer item
 LL |     const _: u32 = T::C;
-   |           -        ^^^^ use of generic parameter from outer item
+   |           -        ^ use of generic parameter from outer item
    |           |
    |           generic parameter used in this inner constant item
    |
diff --git a/tests/ui/resolve/issue-39559.stderr b/tests/ui/resolve/issue-39559.stderr
@@ -2,7 +2,7 @@ error: generic parameters may not be used in const operations
   --> $DIR/issue-39559.rs:14:18
    |
 LL |     entries: [T; D::dim()],
-   |                  ^^^^^^ cannot perform const operation using `D`
+   |                  ^ cannot perform const operation using `D`
    |
    = note: type parameters may not be used in const expressions
    = help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
diff --git a/tests/ui/resolve/use-self-in-inner-fn.stderr b/tests/ui/resolve/use-self-in-inner-fn.stderr
@@ -25,12 +25,12 @@ LL |         fn inner() {
    |            ----- `Self` used in this inner function
 LL |
 LL |             Self::do_something(move || {});
-   |             ^^^^^^^^^^^^^^^^^^ use of `Self` from outer item
+   |             ^^^^ use of `Self` from outer item
    |
 help: refer to the type directly here instead
    |
 LL -             Self::do_something(move || {});
-LL +             MyEnum(move || {});
+LL +             MyEnum::do_something(move || {});
    |
 
 error: aborting due to 2 previous errors
diff --git a/tests/ui/type/pattern_types/assoc_const.default.stderr b/tests/ui/type/pattern_types/assoc_const.default.stderr
@@ -20,7 +20,7 @@ error: generic parameters may not be used in const operations
   --> $DIR/assoc_const.rs:20:40
    |
 LL | fn bar<T: Foo>(_: pattern_type!(u32 is T::START..=T::END)) {}
-   |                                        ^^^^^^^^ cannot perform const operation using `T`
+   |                                        ^ cannot perform const operation using `T`
    |
    = note: type parameters may not be used in const expressions
    = help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
@@ -29,7 +29,7 @@ error: generic parameters may not be used in const operations
   --> $DIR/assoc_const.rs:20:51
    |
 LL | fn bar<T: Foo>(_: pattern_type!(u32 is T::START..=T::END)) {}
-   |                                                   ^^^^^^ cannot perform const operation using `T`
+   |                                                   ^ cannot perform const operation using `T`
    |
    = note: type parameters may not be used in const expressions
    = help: add `#![feature(generic_const_exprs)]` to allow generic const expressions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error: generic parameters may not be used in const operations`
`2`	`2`	`--> $DIR/associated-item-duplicate-bounds.rs:7:18`
`3`	`3`	`\|`
`4`	`4`	`LL \| links: [u32; A::LINKS], // Shouldn't suggest bounds already there.`
`5`		- \| ^^^^^^^^ cannot perform const operation using `A`
	`5`	+ \| ^ cannot perform const operation using `A`
`6`	`6`	`\|`
`7`	`7`	`= note: type parameters may not be used in const expressions`
`8`	`8`	= help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0128]: generic parameter defaults cannot reference parameters before they`
`2`	`2`	`--> $DIR/invalid-type-param-default.rs:12:12`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn mdn<T = T::Item>(_: T) {}`
`5`		- \| ^^^^^^^ cannot reference `T` before it is declared
	`5`	+ \| ^ cannot reference `T` before it is declared
`6`	`6`
`7`	`7`	`error: defaults for generic parameters are not allowed here`
`8`	`8`	`--> $DIR/invalid-type-param-default.rs:7:8`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error: generic parameters may not be used in const operations`
`2`	`2`	`--> $DIR/issue-39559.rs:14:18`
`3`	`3`	`\|`
`4`	`4`	`LL \| entries: [T; D::dim()],`
`5`		- \| ^^^^^^ cannot perform const operation using `D`
	`5`	+ \| ^ cannot perform const operation using `D`
`6`	`6`	`\|`
`7`	`7`	`= note: type parameters may not be used in const expressions`
`8`	`8`	= help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,12 @@ LL \| fn inner() {`
`25`	`25`	\| ----- `Self` used in this inner function
`26`	`26`	`LL \|`
`27`	`27`	`LL \| Self::do_something(move \|\| {});`
`28`		- \| ^^^^^^^^^^^^^^^^^^ use of `Self` from outer item
	`28`	+ \| ^^^^ use of `Self` from outer item
`29`	`29`	`\|`
`30`	`30`	`help: refer to the type directly here instead`
`31`	`31`	`\|`
`32`	`32`	`LL - Self::do_something(move \|\| {});`
`33`		`-LL + MyEnum(move \|\| {});`
	`33`	`+LL + MyEnum::do_something(move \|\| {});`
`34`	`34`	`\|`
`35`	`35`
`36`	`36`	`error: aborting due to 2 previous errors`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ error: generic parameters may not be used in const operations`
`20`	`20`	`--> $DIR/assoc_const.rs:20:40`
`21`	`21`	`\|`
`22`	`22`	`LL \| fn bar<T: Foo>(_: pattern_type!(u32 is T::START..=T::END)) {}`
`23`		- \| ^^^^^^^^ cannot perform const operation using `T`
	`23`	+ \| ^ cannot perform const operation using `T`
`24`	`24`	`\|`
`25`	`25`	`= note: type parameters may not be used in const expressions`
`26`	`26`	= help: add `#![feature(generic_const_exprs)]` to allow generic const expressions
`@@ -29,7 +29,7 @@ error: generic parameters may not be used in const operations`
`29`	`29`	`--> $DIR/assoc_const.rs:20:51`
`30`	`30`	`\|`
`31`	`31`	`LL \| fn bar<T: Foo>(_: pattern_type!(u32 is T::START..=T::END)) {}`
`32`		- \| ^^^^^^ cannot perform const operation using `T`
	`32`	+ \| ^ cannot perform const operation using `T`
`33`	`33`	`\|`
`34`	`34`	`= note: type parameters may not be used in const expressions`
`35`	`35`	= help: add `#![feature(generic_const_exprs)]` to allow generic const expressions