Skip to content

Commit a1e7f6d

Browse files
Dylan-DPCDylan-DPC
authored
Rollup merge of #95654 - notriddle:notriddle/issue-95616, r=davidtwco
diagnostics: use correct span for const generics Fixes #95616
2 parents 661b0e5 + 6ece80f commit a1e7f6d

32 files changed

+91
-56
lines changed

‎compiler/rustc_ast_lowering/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2068,7 +2068,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
20682068
hir::GenericParam {
20692069
hir_id,
20702070
name,
2071-
span: self.lower_span(param.ident.span),
2071+
span: self.lower_span(param.span()),
20722072
pure_wrt_drop: self.sess.contains_name(&param.attrs, sym::may_dangle),
20732073
bounds: self.arena.alloc_from_iter(bounds),
20742074
kind,

‎src/test/ui/associated-types/trait-with-supertraits-needing-sized-self.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ note: required by a bound in `Add`
88
--> $SRC_DIR/core/src/ops/arith.rs:LL:COL
99
|
1010
LL | pub trait Add<Rhs = Self> {
11-
| ^^^ required by this bound in `Add`
11+
| ^^^^^^^^^^ required by this bound in `Add`
1212
help: consider further restricting `Self`
1313
|
1414
LL | trait ArithmeticOps: Add<Output=Self> + Sub<Output=Self> + Mul<Output=Self> + Div<Output=Self> + Sized {}

‎src/test/ui/async-await/issues/issue-78654.full.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ LL | impl<const H: feature> Foo {
55
| ^^^^^^^ not a type
66

77
error[E0207]: the const parameter `H` is not constrained by the impl trait, self type, or predicates
8-
--> $DIR/issue-78654.rs:9:12
8+
--> $DIR/issue-78654.rs:9:6
99
|
1010
LL | impl<const H: feature> Foo {
11-
| ^ unconstrained const parameter
11+
| ^^^^^^^^^^^^^^^^ unconstrained const parameter
1212
|
1313
= note: expressions using a const parameter must map each value to a distinct output value
1414
= note: proving the result of expressions other than the parameter are unique is not supported

‎src/test/ui/async-await/issues/issue-78654.min.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ LL | impl<const H: feature> Foo {
55
| ^^^^^^^ not a type
66

77
error[E0207]: the const parameter `H` is not constrained by the impl trait, self type, or predicates
8-
--> $DIR/issue-78654.rs:9:12
8+
--> $DIR/issue-78654.rs:9:6
99
|
1010
LL | impl<const H: feature> Foo {
11-
| ^ unconstrained const parameter
11+
| ^^^^^^^^^^^^^^^^ unconstrained const parameter
1212
|
1313
= note: expressions using a const parameter must map each value to a distinct output value
1414
= note: proving the result of expressions other than the parameter are unique is not supported

‎src/test/ui/const-generics/defaults/default-on-impl.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: defaults for const parameters are only allowed in `struct`, `enum`, `type`, or `trait` definitions
2-
--> $DIR/default-on-impl.rs:3:12
2+
--> $DIR/default-on-impl.rs:3:6
33
|
44
LL | impl<const N: usize = 1> Foo<N> {}
5-
| ^
5+
| ^^^^^^^^^^^^^^^^^^
66

77
error: aborting due to previous error
88

‎src/test/ui/const-generics/generic_const_exprs/issue-76595.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ note: function defined here, with 2 generic parameters: `T`, `P`
1010
--> $DIR/issue-76595.rs:10:4
1111
|
1212
LL | fn test<T, const P: usize>() where Bool<{core::mem::size_of::<T>() > 4}>: True {
13-
| ^^^^ - -
13+
| ^^^^ - --------------
1414
help: add missing generic argument
1515
|
1616
LL | test::<2, P>();

‎src/test/ui/const-generics/incorrect-number-of-const-args.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ note: function defined here, with 2 generic parameters: `X`, `Y`
1010
--> $DIR/incorrect-number-of-const-args.rs:1:4
1111
|
1212
LL | fn foo<const X: usize, const Y: usize>() -> usize {
13-
| ^^^ - -
13+
| ^^^ -------------- --------------
1414
help: add missing generic argument
1515
|
1616
LL | foo::<0, Y>();
@@ -28,7 +28,7 @@ note: function defined here, with 2 generic parameters: `X`, `Y`
2828
--> $DIR/incorrect-number-of-const-args.rs:1:4
2929
|
3030
LL | fn foo<const X: usize, const Y: usize>() -> usize {
31-
| ^^^ - -
31+
| ^^^ -------------- --------------
3232

3333
error: aborting due to 2 previous errors
3434

‎src/test/ui/const-generics/issues/issue-68366.full.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
error[E0207]: the const parameter `N` is not constrained by the impl trait, self type, or predicates
2-
--> $DIR/issue-68366.rs:11:13
2+
--> $DIR/issue-68366.rs:11:7
33
|
44
LL | impl <const N: usize> Collatz<{Some(N)}> {}
5-
| ^ unconstrained const parameter
5+
| ^^^^^^^^^^^^^^ unconstrained const parameter
66
|
77
= note: expressions using a const parameter must map each value to a distinct output value
88
= note: proving the result of expressions other than the parameter are unique is not supported
99

1010
error[E0207]: the const parameter `N` is not constrained by the impl trait, self type, or predicates
11-
--> $DIR/issue-68366.rs:17:12
11+
--> $DIR/issue-68366.rs:17:6
1212
|
1313
LL | impl<const N: usize> Foo {}
14-
| ^ unconstrained const parameter
14+
| ^^^^^^^^^^^^^^ unconstrained const parameter
1515
|
1616
= note: expressions using a const parameter must map each value to a distinct output value
1717
= note: proving the result of expressions other than the parameter are unique is not supported

‎src/test/ui/const-generics/issues/issue-68366.min.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ LL | impl <const N: usize> Collatz<{Some(N)}> {}
88
= help: use `#![feature(generic_const_exprs)]` to allow generic const expressions
99

1010
error[E0207]: the const parameter `N` is not constrained by the impl trait, self type, or predicates
11-
--> $DIR/issue-68366.rs:11:13
11+
--> $DIR/issue-68366.rs:11:7
1212
|
1313
LL | impl <const N: usize> Collatz<{Some(N)}> {}
14-
| ^ unconstrained const parameter
14+
| ^^^^^^^^^^^^^^ unconstrained const parameter
1515
|
1616
= note: expressions using a const parameter must map each value to a distinct output value
1717
= note: proving the result of expressions other than the parameter are unique is not supported
1818

1919
error[E0207]: the const parameter `N` is not constrained by the impl trait, self type, or predicates
20-
--> $DIR/issue-68366.rs:17:12
20+
--> $DIR/issue-68366.rs:17:6
2121
|
2222
LL | impl<const N: usize> Foo {}
23-
| ^ unconstrained const parameter
23+
| ^^^^^^^^^^^^^^ unconstrained const parameter
2424
|
2525
= note: expressions using a const parameter must map each value to a distinct output value
2626
= note: proving the result of expressions other than the parameter are unique is not supported

‎src/test/ui/const-generics/issues/issue-86820.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
error[E0053]: method `bit` has an incompatible const parameter type for trait
2-
--> $DIR/issue-86820.rs:17:18
2+
--> $DIR/issue-86820.rs:17:12
33
|
44
LL | fn bit<const I : usize>(self) -> bool {
5-
| ^
5+
| ^^^^^^^^^^^^^^^
66
|
77
note: the const parameter `I` has type `usize`, but the declaration in trait `Bits::bit` has type `u8`
8-
--> $DIR/issue-86820.rs:12:18
8+
--> $DIR/issue-86820.rs:12:12
99
|
1010
LL | fn bit<const I : u8>(self) -> bool;
11-
| ^
11+
| ^^^^^^^^^^^^
1212

1313
error: aborting due to previous error
1414

‎src/test/ui/const-generics/min_const_generics/default_function_param.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: defaults for const parameters are only allowed in `struct`, `enum`, `type`, or `trait` definitions
2-
--> $DIR/default_function_param.rs:3:14
2+
--> $DIR/default_function_param.rs:3:8
33
|
44
LL | fn foo<const SIZE: usize = 5usize>() {}
5-
| ^^^^
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
66

77
error: aborting due to previous error
88

‎src/test/ui/const-generics/parser-error-recovery/issue-89013-no-kw.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ note: trait defined here, with 1 generic parameter: `N`
1717
--> $DIR/issue-89013-no-kw.rs:1:7
1818
|
1919
LL | trait Foo<const N: usize> {
20-
| ^^^ -
20+
| ^^^ --------------
2121
help: add missing generic argument
2222
|
2323
LL | impl Foo<N, N = 3> for Bar {

‎src/test/ui/const-generics/parser-error-recovery/issue-89013.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ note: trait defined here, with 1 generic parameter: `N`
2929
--> $DIR/issue-89013.rs:1:7
3030
|
3131
LL | trait Foo<const N: usize> {
32-
| ^^^ -
32+
| ^^^ --------------
3333
help: add missing generic argument
3434
|
3535
LL | impl Foo<N, N = const 3> for Bar {

‎src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: defaults for type parameters are only allowed in `struct`, `enum`, `type`
22
--> $DIR/feature-gate-default_type_parameter_fallback.rs:3:8
33
|
44
LL | fn avg<T=i32>(_: T) {}
5-
| ^
5+
| ^^^^^
66
|
77
= note: `#[deny(invalid_type_param_default)]` on by default
88
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
@@ -12,7 +12,7 @@ error: defaults for type parameters are only allowed in `struct`, `enum`, `type`
1212
--> $DIR/feature-gate-default_type_parameter_fallback.rs:8:6
1313
|
1414
LL | impl<T=i32> S<T> {}
15-
| ^
15+
| ^^^^^
1616
|
1717
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
1818
= note: for more information, see issue #36887 <https://github.com/rust-lang/rust/issues/36887>

‎src/test/ui/generics/generic-impl-more-params-with-defaults.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ note: struct defined here, with at most 2 generic parameters: `T`, `A`
1010
--> $DIR/generic-impl-more-params-with-defaults.rs:5:8
1111
|
1212
LL | struct Vec<T, A = Heap>(
13-
| ^^^ - -
13+
| ^^^ - --------
1414

1515
error: aborting due to previous error
1616

‎src/test/ui/generics/generic-type-more-params-with-defaults.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ note: struct defined here, with at most 2 generic parameters: `T`, `A`
1010
--> $DIR/generic-type-more-params-with-defaults.rs:5:8
1111
|
1212
LL | struct Vec<T, A = Heap>(
13-
| ^^^ - -
13+
| ^^^ - --------
1414

1515
error: aborting due to previous error
1616

‎src/test/ui/generics/issue-61631-default-type-param-can-reference-self-in-trait.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ note: required by a bound in `Tsized`
99
--> $DIR/issue-61631-default-type-param-can-reference-self-in-trait.rs:17:14
1010
|
1111
LL | trait Tsized<P: Sized = [Self]> {}
12-
| ^ required by this bound in `Tsized`
12+
| ^^^^^^^^^^^^^^^^^ required by this bound in `Tsized`
1313

1414
error: aborting due to previous error
1515

‎src/test/ui/generics/wrong-number-of-args.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ note: struct defined here, with at most 3 generic parameters: `A`, `B`, `C`
287287
--> $DIR/wrong-number-of-args.rs:78:12
288288
|
289289
LL | struct Ty<A, B, C = &'static str>;
290-
| ^^ - - -
290+
| ^^ - - ----------------
291291

292292
error[E0107]: this struct takes at least 2 generic arguments but 0 generic arguments were supplied
293293
--> $DIR/wrong-number-of-args.rs:96:14
@@ -922,7 +922,7 @@ note: struct defined here, with at most 3 generic parameters: `K`, `V`, `S`
922922
--> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL
923923
|
924924
LL | pub struct HashMap<K, V, S = RandomState> {
925-
| ^^^^^^^ - - -
925+
| ^^^^^^^ - - ---------------
926926

927927
error[E0107]: this struct takes at least 2 generic arguments but 0 generic arguments were supplied
928928
--> $DIR/wrong-number-of-args.rs:319:18

‎src/test/ui/impl-trait/where-allowed.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ error: defaults for type parameters are only allowed in `struct`, `enum`, `type`
293293
--> $DIR/where-allowed.rs:234:7
294294
|
295295
LL | impl <T = impl Debug> T {}
296-
| ^
296+
| ^^^^^^^^^^^^^^
297297
|
298298
= note: `#[deny(invalid_type_param_default)]` on by default
299299
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
@@ -303,7 +303,7 @@ error: defaults for type parameters are only allowed in `struct`, `enum`, `type`
303303
--> $DIR/where-allowed.rs:241:36
304304
|
305305
LL | fn in_method_generic_param_default<T = impl Debug>(_: T) {}
306-
| ^
306+
| ^^^^^^^^^^^^^^
307307
|
308308
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
309309
= note: for more information, see issue #36887 <https://github.com/rust-lang/rust/issues/36887>

‎src/test/ui/issues/issue-78957.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ error[E0518]: attribute should be applied to function or closure
22
--> $DIR/issue-78957.rs:5:16
33
|
44
LL | pub struct Foo<#[inline] const N: usize>;
5-
| ^^^^^^^^^ - not a function or closure
5+
| ^^^^^^^^^ -------------- not a function or closure
66

77
error: attribute should be applied to a function
88
--> $DIR/issue-78957.rs:7:16
99
|
1010
LL | pub struct Bar<#[cold] const N: usize>;
11-
| ^^^^^^^ - not a function
11+
| ^^^^^^^ -------------- not a function
1212
|
1313
note: the lint level is defined here
1414
--> $DIR/issue-78957.rs:1:9
@@ -21,7 +21,7 @@ error[E0517]: attribute should be applied to a struct, enum, or union
2121
--> $DIR/issue-78957.rs:10:23
2222
|
2323
LL | pub struct Baz<#[repr(C)] const N: usize>;
24-
| ^ - not a struct, enum, or union
24+
| ^ -------------- not a struct, enum, or union
2525

2626
error[E0518]: attribute should be applied to function or closure
2727
--> $DIR/issue-78957.rs:13:17

‎src/test/ui/mir/thir-constparam-temp.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ note: mutable reference created due to call to this method
1313
LL | fn mut_self(&mut self) {}
1414
| ^^^^^^^^^^^^^^^^^^^^^^
1515
note: `const` item defined here
16-
--> $DIR/thir-constparam-temp.rs:13:14
16+
--> $DIR/thir-constparam-temp.rs:13:8
1717
|
1818
LL | fn foo<const YIKES: Yikes>() {
19-
| ^^^^^
19+
| ^^^^^^^^^^^^^^^^^^
2020

2121
warning: 1 warning emitted
2222

‎src/test/ui/missing/missing-items/missing-type-parameter2.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ LL | impl X<{ N }> {}
9999
| + +
100100

101101
error: defaults for const parameters are only allowed in `struct`, `enum`, `type`, or `trait` definitions
102-
--> $DIR/missing-type-parameter2.rs:6:15
102+
--> $DIR/missing-type-parameter2.rs:6:9
103103
|
104104
LL | impl<T, const A: u8 = 2> X<N> {}
105-
| ^
105+
| ^^^^^^^^^^^^^^^
106106

107107
error[E0747]: unresolved item provided when a constant was expected
108108
--> $DIR/missing-type-parameter2.rs:6:28

‎src/test/ui/polymorphization/const_parameters/closures.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ error: item has unused generic parameters
1111
--> $DIR/closures.rs:19:19
1212
|
1313
LL | pub fn unused<const T: usize>() -> usize {
14-
| - generic parameter `T` is unused
14+
| -------------- generic parameter `T` is unused
1515
LL |
1616
LL | let add_one = |x: usize| x + 1;
1717
| ^^^^^^^^^^^^^^^^
@@ -20,13 +20,13 @@ error: item has unused generic parameters
2020
--> $DIR/closures.rs:17:8
2121
|
2222
LL | pub fn unused<const T: usize>() -> usize {
23-
| ^^^^^^ - generic parameter `T` is unused
23+
| ^^^^^^ -------------- generic parameter `T` is unused
2424

2525
error: item has unused generic parameters
2626
--> $DIR/closures.rs:28:19
2727
|
2828
LL | pub fn used_parent<const T: usize>() -> usize {
29-
| - generic parameter `T` is unused
29+
| -------------- generic parameter `T` is unused
3030
LL | let x: usize = T;
3131
LL | let add_one = |x: usize| x + 1;
3232
| ^^^^^^^^^^^^^^^^
@@ -35,7 +35,7 @@ error: item has unused generic parameters
3535
--> $DIR/closures.rs:48:13
3636
|
3737
LL | pub fn unused_upvar<const T: usize>() -> usize {
38-
| - generic parameter `T` is unused
38+
| -------------- generic parameter `T` is unused
3939
LL | let x: usize = T;
4040
LL | let y = || x;
4141
| ^^^^

‎src/test/ui/polymorphization/const_parameters/functions.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ error: item has unused generic parameters
1111
--> $DIR/functions.rs:15:8
1212
|
1313
LL | pub fn unused<const T: usize>() {
14-
| ^^^^^^ - generic parameter `T` is unused
14+
| ^^^^^^ -------------- generic parameter `T` is unused
1515

1616
error: aborting due to previous error; 1 warning emitted
1717

‎src/test/ui/polymorphization/generators.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ error: item has unused generic parameters
2323
--> $DIR/generators.rs:60:5
2424
|
2525
LL | pub fn unused_const<const T: u32>() -> impl Generator<(), Yield = u32, Return = u32> + Unpin {
26-
| - generic parameter `T` is unused
26+
| ------------ generic parameter `T` is unused
2727
LL | / || {
2828
LL | |
2929
LL | | yield 1;

‎src/test/ui/save-analysis/issue-89066.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ note: struct defined here, with 2 generic parameters: `T`, `N`
3131
--> $DIR/issue-89066.rs:8:8
3232
|
3333
LL | struct All<'a, T, const N: usize> {
34-
| ^^^ - -
34+
| ^^^ - --------------
3535

3636
error: aborting due to 4 previous errors
3737

‎src/test/ui/suggestions/lifetimes/missing-lifetimes-in-signature-before-const.fixed

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// run-rustfix
2+
// https://github.com/rust-lang/rust/issues/95616
3+
4+
fn buggy_const<'a, const N: usize>(_a: &'a Option<[u8; N]>, _f: &'a str) -> &'a str { //~ERROR [E0106]
5+
return "";
6+
}
7+
8+
fn main() {
9+
buggy_const(&Some([69,69,69,69,0]), "test");
10+
}

‎src/test/ui/suggestions/lifetimes/missing-lifetimes-in-signature-before-const.rs

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// run-rustfix
2+
// https://github.com/rust-lang/rust/issues/95616
3+
4+
fn buggy_const<const N: usize>(_a: &Option<[u8; N]>, _f: &str) -> &str { //~ERROR [E0106]
5+
return "";
6+
}
7+
8+
fn main() {
9+
buggy_const(&Some([69,69,69,69,0]), "test");
10+
}

0 commit comments

Comments
 (0)