Skip to content

Commit 28970a2

Browse files
compiler-errorscompiler-errors
committed
Simplify array length mismatch error reporting
1 parent e48241b commit 28970a2

18 files changed

+60
-71
lines changed

‎compiler/rustc_middle/src/ty/consts.rs

-4
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,6 @@ impl<'tcx> Const<'tcx> {
151151
}
152152

153153
impl<'tcx> rustc_type_ir::inherent::Const<TyCtxt<'tcx>> for Const<'tcx> {
154-
fn try_to_target_usize(self, interner: TyCtxt<'tcx>) -> Option<u64> {
155-
self.try_to_target_usize(interner)
156-
}
157-
158154
fn new_infer(tcx: TyCtxt<'tcx>, infer: ty::InferConst) -> Self {
159155
Const::new_infer(tcx, infer)
160156
}

‎compiler/rustc_middle/src/ty/error.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,9 @@ impl<'tcx> TypeError<'tcx> {
5858
pluralize!(values.found)
5959
)
6060
.into(),
61-
TypeError::FixedArraySize(values) => format!(
62-
"expected an array with a fixed size of {} element{}, found one with {} element{}",
63-
values.expected,
64-
pluralize!(values.expected),
65-
values.found,
66-
pluralize!(values.found)
61+
TypeError::ArraySize(values) => format!(
62+
"expected an array with a size of {}, found one with a size of {}",
63+
values.expected, values.found,
6764
)
6865
.into(),
6966
TypeError::ArgCount => "incorrect number of function parameters".into(),

‎compiler/rustc_trait_selection/src/error_reporting/infer/mod.rs

+9-4
Original file line numberDiff line numberDiff line change
@@ -1792,12 +1792,12 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
17921792

17931793
fn suggest_specify_actual_length(
17941794
&self,
1795-
terr: TypeError<'_>,
1796-
trace: &TypeTrace<'_>,
1795+
terr: TypeError<'tcx>,
1796+
trace: &TypeTrace<'tcx>,
17971797
span: Span,
17981798
) -> Option<TypeErrorAdditionalDiags> {
17991799
let hir = self.tcx.hir();
1800-
let TypeError::FixedArraySize(sz) = terr else {
1800+
let TypeError::ArraySize(sz) = terr else {
18011801
return None;
18021802
};
18031803
let tykind = match self.tcx.hir_node_by_def_id(trace.cause.body_id) {
@@ -1838,9 +1838,14 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
18381838
if let Some(tykind) = tykind
18391839
&& let hir::TyKind::Array(_, length) = tykind
18401840
&& let hir::ArrayLen::Body(ct) = length
1841+
&& let Some((scalar, ty)) = sz.found.try_to_scalar()
1842+
&& ty == self.tcx.types.usize
18411843
{
18421844
let span = ct.span();
1843-
Some(TypeErrorAdditionalDiags::ConsiderSpecifyingLength { span, length: sz.found })
1845+
Some(TypeErrorAdditionalDiags::ConsiderSpecifyingLength {
1846+
span,
1847+
length: scalar.to_target_usize(&self.tcx).unwrap(),
1848+
})
18441849
} else {
18451850
None
18461851
}

‎compiler/rustc_type_ir/src/error.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pub enum TypeError<I: Interner> {
2929
Mutability,
3030
ArgumentMutability(usize),
3131
TupleSize(ExpectedFound<usize>),
32-
FixedArraySize(ExpectedFound<u64>),
32+
ArraySize(ExpectedFound<I::Const>),
3333
ArgCount,
3434

3535
RegionsDoesNotOutlive(I::Region, I::Region),
@@ -69,7 +69,7 @@ impl<I: Interner> TypeError<I> {
6969
use self::TypeError::*;
7070
match self {
7171
CyclicTy(_) | CyclicConst(_) | SafetyMismatch(_) | PolarityMismatch(_) | Mismatch
72-
| AbiMismatch(_) | FixedArraySize(_) | ArgumentSorts(..) | Sorts(_)
72+
| AbiMismatch(_) | ArraySize(_) | ArgumentSorts(..) | Sorts(_)
7373
| VariadicMismatch(_) | TargetFeatureCast(_) => false,
7474

7575
Mutability

‎compiler/rustc_type_ir/src/inherent.rs

-2
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,6 @@ pub trait Const<I: Interner<Const = Self>>:
257257
+ Relate<I>
258258
+ Flags
259259
{
260-
fn try_to_target_usize(self, interner: I) -> Option<u64>;
261-
262260
fn new_infer(interner: I, var: ty::InferConst) -> Self;
263261

264262
fn new_var(interner: I, var: ty::ConstVid) -> Self;

‎compiler/rustc_type_ir/src/relate.rs

+3-12
Original file line numberDiff line numberDiff line change
@@ -501,19 +501,10 @@ pub fn structurally_relate_tys<I: Interner, R: TypeRelation<I>>(
501501
let t = relation.relate(a_t, b_t)?;
502502
match relation.relate(sz_a, sz_b) {
503503
Ok(sz) => Ok(Ty::new_array_with_const_len(cx, t, sz)),
504-
Err(err) => {
505-
// Check whether the lengths are both concrete/known values,
506-
// but are unequal, for better diagnostics.
507-
let sz_a = sz_a.try_to_target_usize(cx);
508-
let sz_b = sz_b.try_to_target_usize(cx);
509-
510-
match (sz_a, sz_b) {
511-
(Some(sz_a_val), Some(sz_b_val)) if sz_a_val != sz_b_val => {
512-
Err(TypeError::FixedArraySize(ExpectedFound::new(sz_a_val, sz_b_val)))
513-
}
514-
_ => Err(err),
515-
}
504+
Err(TypeError::ConstMismatch(_)) => {
505+
Err(TypeError::ArraySize(ExpectedFound::new(sz_a, sz_b)))
516506
}
507+
Err(e) => Err(e),
517508
}
518509
}
519510

‎tests/crashes/126359.rs

-9
This file was deleted.

‎tests/crashes/131101.rs

-12
This file was deleted.

‎tests/ui/array-slice-vec/match_arr_unknown_len.stderr

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ error[E0308]: mismatched types
22
--> $DIR/match_arr_unknown_len.rs:3:9
33
|
44
LL | [1, 2] => true,
5-
| ^^^^^^ expected `2`, found `N`
6-
|
7-
= note: expected array `[u32; 2]`
8-
found array `[u32; N]`
5+
| ^^^^^^ expected an array with a size of 2, found one with a size of N
96

107
error: aborting due to 1 previous error
118

‎tests/ui/const-generics/const-argument-cross-crate-mismatch.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
22
--> $DIR/const-argument-cross-crate-mismatch.rs:6:67
33
|
44
LL | let _ = const_generic_lib::function(const_generic_lib::Struct([0u8, 1u8]));
5-
| ------------------------- ^^^^^^^^^^ expected an array with a fixed size of 3 elements, found one with 2 elements
5+
| ------------------------- ^^^^^^^^^^ expected an array with a size of 3, found one with a size of 2
66
| |
77
| arguments to this struct are incorrect
88
|
@@ -16,7 +16,7 @@ error[E0308]: mismatched types
1616
--> $DIR/const-argument-cross-crate-mismatch.rs:8:65
1717
|
1818
LL | let _: const_generic_lib::Alias = const_generic_lib::Struct([0u8, 1u8, 2u8]);
19-
| ------------------------- ^^^^^^^^^^^^^^^ expected an array with a fixed size of 2 elements, found one with 3 elements
19+
| ------------------------- ^^^^^^^^^^^^^^^ expected an array with a size of 2, found one with a size of 3
2020
| |
2121
| arguments to this struct are incorrect
2222
|

‎tests/ui/const-generics/generic-param-mismatch.stderr

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@ error[E0308]: mismatched types
44
LL | fn test<const N: usize, const M: usize>() -> [u8; M] {
55
| ------- expected `[u8; M]` because of return type
66
LL | [0; N]
7-
| ^^^^^^ expected `M`, found `N`
8-
|
9-
= note: expected array `[u8; M]`
10-
found array `[u8; N]`
7+
| ^^^^^^ expected an array with a size of M, found one with a size of N
118

129
error: aborting due to 1 previous error
1310

‎tests/ui/const-generics/generic_const_exprs/issue-62504.min.stderr

+1-3
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ error[E0308]: mismatched types
1010
--> $DIR/issue-62504.rs:18:21
1111
|
1212
LL | ArrayHolder([0; Self::SIZE])
13-
| ----------- ^^^^^^^^^^^^^^^ expected `X`, found `Self::SIZE`
13+
| ----------- ^^^^^^^^^^^^^^^ expected an array with a size of X, found one with a size of Self::SIZE
1414
| |
1515
| arguments to this struct are incorrect
1616
|
17-
= note: expected array `[u32; X]`
18-
found array `[u32; Self::SIZE]`
1917
note: tuple struct defined here
2018
--> $DIR/issue-62504.rs:14:8
2119
|

‎tests/ui/consts/array-literal-len-mismatch.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
22
--> $DIR/array-literal-len-mismatch.rs:1:26
33
|
44
LL | const NUMBERS: [u8; 3] = [10, 20];
5-
| - ^^^^^^^^ expected an array with a fixed size of 3 elements, found one with 2 elements
5+
| - ^^^^^^^^ expected an array with a size of 3, found one with a size of 2
66
| |
77
| help: consider specifying the actual array length: `2`
88

‎tests/ui/consts/bad-array-size-in-type-err.rs

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
struct BadArraySize<const N: u8> {
2+
arr: [i32; N],
3+
//~^ ERROR the constant `N` is not of type `usize`
4+
}
5+
6+
fn main() {
7+
let _ = BadArraySize::<2> { arr: [0, 0, 0] };
8+
//~^ ERROR mismatched types
9+
//~| ERROR the constant `2` is not of type `usize`
10+
}

‎tests/ui/consts/bad-array-size-in-type-err.stderr

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
error: the constant `N` is not of type `usize`
2+
--> $DIR/bad-array-size-in-type-err.rs:2:10
3+
|
4+
LL | arr: [i32; N],
5+
| ^^^^^^^^ expected `usize`, found `u8`
6+
7+
error[E0308]: mismatched types
8+
--> $DIR/bad-array-size-in-type-err.rs:7:38
9+
|
10+
LL | let _ = BadArraySize::<2> { arr: [0, 0, 0] };
11+
| ^^^^^^^^^ expected an array with a size of 2, found one with a size of 3
12+
13+
error: the constant `2` is not of type `usize`
14+
--> $DIR/bad-array-size-in-type-err.rs:7:38
15+
|
16+
LL | let _ = BadArraySize::<2> { arr: [0, 0, 0] };
17+
| ^^^^^^^^^ expected `usize`, found `u8`
18+
19+
error: aborting due to 3 previous errors
20+
21+
For more information about this error, try `rustc --explain E0308`.

‎tests/ui/consts/const-array-oob-arith.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ const VAL: i32 = ARR[IDX];
44
const BONG: [i32; (ARR[0] - 41) as usize] = [5];
55
const BLUB: [i32; (ARR[0] - 40) as usize] = [5];
66
//~^ ERROR: mismatched types
7-
//~| expected an array with a fixed size of 2 elements, found one with 1 element
7+
//~| expected an array
88
const BOO: [i32; (ARR[0] - 41) as usize] = [5, 99];
99
//~^ ERROR: mismatched types
10-
//~| expected an array with a fixed size of 1 element, found one with 2 elements
10+
//~| expected an array
1111

1212
fn main() {
1313
let _ = VAL;

‎tests/ui/consts/const-array-oob-arith.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ error[E0308]: mismatched types
22
--> $DIR/const-array-oob-arith.rs:5:45
33
|
44
LL | const BLUB: [i32; (ARR[0] - 40) as usize] = [5];
5-
| ---------------------- ^^^ expected an array with a fixed size of 2 elements, found one with 1 element
5+
| ---------------------- ^^^ expected an array with a size of 2, found one with a size of 1
66
| |
77
| help: consider specifying the actual array length: `1`
88

99
error[E0308]: mismatched types
1010
--> $DIR/const-array-oob-arith.rs:8:44
1111
|
1212
LL | const BOO: [i32; (ARR[0] - 41) as usize] = [5, 99];
13-
| ---------------------- ^^^^^^^ expected an array with a fixed size of 1 element, found one with 2 elements
13+
| ---------------------- ^^^^^^^ expected an array with a size of 1, found one with a size of 2
1414
| |
1515
| help: consider specifying the actual array length: `2`
1616

‎tests/ui/inference/array-len-mismatch.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error[E0308]: mismatched types
22
--> $DIR/array-len-mismatch.rs:6:26
33
|
44
LL | let wrong: [u8; 3] = [10, 20];
5-
| ------- ^^^^^^^^ expected an array with a fixed size of 3 elements, found one with 2 elements
5+
| ------- ^^^^^^^^ expected an array with a size of 3, found one with a size of 2
66
| | |
77
| | help: consider specifying the actual array length: `2`
88
| expected due to this
@@ -11,7 +11,7 @@ error[E0308]: mismatched types
1111
--> $DIR/array-len-mismatch.rs:9:26
1212
|
1313
LL | let wrong: [u8; 3] = returns_arr();
14-
| ------- ^^^^^^^^^^^^^ expected an array with a fixed size of 3 elements, found one with 2 elements
14+
| ------- ^^^^^^^^^^^^^ expected an array with a size of 3, found one with a size of 2
1515
| | |
1616
| | help: consider specifying the actual array length: `2`
1717
| expected due to this

0 commit comments

Comments
 (0)