Call them constants instead of types
This commit is contained in:
Michael Goulet
parent
4a24f08ba4
commit
4e976262a1
12 changed files with 47 additions and 42 deletions
|
|
@ -1588,9 +1588,14 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
|
|||
Mismatch::Variable(infer::ExpectedFound { expected, found }),
|
||||
)
|
||||
}
|
||||
ValuePairs::Terms(infer::ExpectedFound {
|
||||
expected: ty::Term::Const(_),
|
||||
found: ty::Term::Const(_),
|
||||
}) => (false, Mismatch::Fixed("constant")),
|
||||
ValuePairs::TraitRefs(_) | ValuePairs::PolyTraitRefs(_) => {
|
||||
(false, Mismatch::Fixed("trait"))
|
||||
}
|
||||
ValuePairs::Regions(_) => (false, Mismatch::Fixed("lifetime")),
|
||||
_ => (false, Mismatch::Fixed("type")),
|
||||
};
|
||||
let vals = match self.values_str(values) {
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ error[E0308]: mismatched types
|
|||
LL | Foo::<10, 12>
|
||||
| ^^^^^^^^^^^^^ expected `11`, found `12`
|
||||
|
|
||||
= note: expected type `11`
|
||||
found type `12`
|
||||
= note: expected constant `11`
|
||||
found constant `12`
|
||||
|
||||
error: aborting due to previous error
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ error[E0308]: mismatched types
|
|||
LL | Foo::<N, { N + 2 }>
|
||||
| ^^^^^^^^^^^^^^^^^^^ expected `{ N + 1 }`, found `{ N + 2 }`
|
||||
|
|
||||
= note: expected type `{ N + 1 }`
|
||||
found type `{ N + 2 }`
|
||||
= note: expected constant `{ N + 1 }`
|
||||
found constant `{ N + 2 }`
|
||||
|
||||
error: aborting due to previous error
|
||||
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ error[E0308]: mismatched types
|
|||
LL | assert_impl::<HasCastInTraitImpl<{ N + 1 }, { N as u128 }>>();
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `{ N as u128 }`, found `{ O as u128 }`
|
||||
|
|
||||
= note: expected type `{ N as u128 }`
|
||||
found type `{ O as u128 }`
|
||||
= note: expected constant `{ N as u128 }`
|
||||
found constant `{ O as u128 }`
|
||||
|
||||
error: unconstrained generic constant
|
||||
--> $DIR/abstract-const-as-cast-3.rs:20:19
|
||||
|
|
@ -49,8 +49,8 @@ error[E0308]: mismatched types
|
|||
LL | assert_impl::<HasCastInTraitImpl<{ N + 1 }, { N as _ }>>();
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `{ N as _ }`, found `{ O as u128 }`
|
||||
|
|
||||
= note: expected type `{ N as _ }`
|
||||
found type `{ O as u128 }`
|
||||
= note: expected constant `{ N as _ }`
|
||||
found constant `{ O as u128 }`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/abstract-const-as-cast-3.rs:23:5
|
||||
|
|
@ -58,8 +58,8 @@ error[E0308]: mismatched types
|
|||
LL | assert_impl::<HasCastInTraitImpl<13, { 12 as u128 }>>();
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `12`, found `13`
|
||||
|
|
||||
= note: expected type `12`
|
||||
found type `13`
|
||||
= note: expected constant `12`
|
||||
found constant `13`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/abstract-const-as-cast-3.rs:25:5
|
||||
|
|
@ -67,8 +67,8 @@ error[E0308]: mismatched types
|
|||
LL | assert_impl::<HasCastInTraitImpl<14, 13>>();
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `13`, found `14`
|
||||
|
|
||||
= note: expected type `13`
|
||||
found type `14`
|
||||
= note: expected constant `13`
|
||||
found constant `14`
|
||||
|
||||
error: unconstrained generic constant
|
||||
--> $DIR/abstract-const-as-cast-3.rs:35:19
|
||||
|
|
@ -94,8 +94,8 @@ error[E0308]: mismatched types
|
|||
LL | assert_impl::<HasCastInTraitImpl<{ N + 1 }, { N as u128 }>>();
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `{ N as u128 }`, found `{ O as u128 }`
|
||||
|
|
||||
= note: expected type `{ N as u128 }`
|
||||
found type `{ O as u128 }`
|
||||
= note: expected constant `{ N as u128 }`
|
||||
found constant `{ O as u128 }`
|
||||
|
||||
error: unconstrained generic constant
|
||||
--> $DIR/abstract-const-as-cast-3.rs:38:19
|
||||
|
|
@ -121,8 +121,8 @@ error[E0308]: mismatched types
|
|||
LL | assert_impl::<HasCastInTraitImpl<{ N + 1 }, { N as _ }>>();
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `{ N as _ }`, found `{ O as u128 }`
|
||||
|
|
||||
= note: expected type `{ N as _ }`
|
||||
found type `{ O as u128 }`
|
||||
= note: expected constant `{ N as _ }`
|
||||
found constant `{ O as u128 }`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/abstract-const-as-cast-3.rs:41:5
|
||||
|
|
@ -130,8 +130,8 @@ error[E0308]: mismatched types
|
|||
LL | assert_impl::<HasCastInTraitImpl<13, { 12 as u128 }>>();
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `12`, found `13`
|
||||
|
|
||||
= note: expected type `12`
|
||||
found type `13`
|
||||
= note: expected constant `12`
|
||||
found constant `13`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/abstract-const-as-cast-3.rs:43:5
|
||||
|
|
@ -139,8 +139,8 @@ error[E0308]: mismatched types
|
|||
LL | assert_impl::<HasCastInTraitImpl<14, 13>>();
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `13`, found `14`
|
||||
|
|
||||
= note: expected type `13`
|
||||
found type `14`
|
||||
= note: expected constant `13`
|
||||
found constant `14`
|
||||
|
||||
error: aborting due to 12 previous errors
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ error[E0308]: mismatched types
|
|||
LL | [0; size_of::<Foo<T>>()]
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^ expected `size_of::<T>()`, found `size_of::<Foo<T>>()`
|
||||
|
|
||||
= note: expected type `size_of::<T>()`
|
||||
found type `size_of::<Foo<T>>()`
|
||||
= note: expected constant `size_of::<T>()`
|
||||
found constant `size_of::<Foo<T>>()`
|
||||
|
||||
error: unconstrained generic constant
|
||||
--> $DIR/different-fn.rs:10:9
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ error[E0308]: mismatched types
|
|||
LL | ArrayHolder([0; Self::SIZE])
|
||||
| ^^^^^^^^^^^^^^^ expected `X`, found `Self::SIZE`
|
||||
|
|
||||
= note: expected type `X`
|
||||
found type `Self::SIZE`
|
||||
= note: expected constant `X`
|
||||
found constant `Self::SIZE`
|
||||
|
||||
error: unconstrained generic constant
|
||||
--> $DIR/issue-62504.rs:18:25
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ error[E0308]: mismatched types
|
|||
LL | let x: Arr<{usize::MAX}> = Arr {};
|
||||
| ^^^^^^^^^^^^^^^^^ expected `false`, found `true`
|
||||
|
|
||||
= note: expected type `false`
|
||||
found type `true`
|
||||
= note: expected constant `false`
|
||||
found constant `true`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/issue-72819-generic-in-const-eval.rs:20:32
|
||||
|
|
@ -13,8 +13,8 @@ error[E0308]: mismatched types
|
|||
LL | let x: Arr<{usize::MAX}> = Arr {};
|
||||
| ^^^ expected `false`, found `true`
|
||||
|
|
||||
= note: expected type `false`
|
||||
found type `true`
|
||||
= note: expected constant `false`
|
||||
found constant `true`
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ error[E0308]: method not compatible with trait
|
|||
LL | fn size(&self) -> [usize; DIM] {
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `Self::DIM`, found `DIM`
|
||||
|
|
||||
= note: expected type `Self::DIM`
|
||||
found type `DIM`
|
||||
= note: expected constant `Self::DIM`
|
||||
found constant `DIM`
|
||||
|
||||
error: unconstrained generic constant
|
||||
--> $DIR/issue-83765.rs:32:24
|
||||
|
|
@ -26,8 +26,8 @@ error[E0308]: mismatched types
|
|||
LL | self.reference.size()
|
||||
| ^^^^^^^^^^^^^^^^^^^^^ expected `DIM`, found `Self::DIM`
|
||||
|
|
||||
= note: expected type `DIM`
|
||||
found type `Self::DIM`
|
||||
= note: expected constant `DIM`
|
||||
found constant `Self::DIM`
|
||||
|
||||
error: aborting due to 3 previous errors
|
||||
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ error[E0308]: mismatched types
|
|||
LL | writes_to_specific_path(&cap);
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^ expected `true`, found `{ contains::<T, U>() }`
|
||||
|
|
||||
= note: expected type `true`
|
||||
found type `{ contains::<T, U>() }`
|
||||
= note: expected constant `true`
|
||||
found constant `{ contains::<T, U>() }`
|
||||
|
||||
error: aborting due to 3 previous errors
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ error[E0308]: mismatched types
|
|||
LL | let x: Arr<{usize::MAX}> = Arr {};
|
||||
| ^^^^^^^^^^^^^^^^^ expected `false`, found `true`
|
||||
|
|
||||
= note: expected type `false`
|
||||
found type `true`
|
||||
= note: expected constant `false`
|
||||
found constant `true`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/issue-73260.rs:16:32
|
||||
|
|
@ -13,8 +13,8 @@ error[E0308]: mismatched types
|
|||
LL | let x: Arr<{usize::MAX}> = Arr {};
|
||||
| ^^^ expected `false`, found `true`
|
||||
|
|
||||
= note: expected type `false`
|
||||
found type `true`
|
||||
= note: expected constant `false`
|
||||
found constant `true`
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ error[E0308]: mismatched types
|
|||
LL | requires_distinct("str", 12);
|
||||
| ^^^^^^^^^^^^^^^^^ expected `true`, found `false`
|
||||
|
|
||||
= note: expected type `true`
|
||||
found type `false`
|
||||
= note: expected constant `true`
|
||||
found constant `false`
|
||||
|
||||
error: aborting due to previous error
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ error[E0308]: mismatched types
|
|||
LL | let _: A<'a, u32, {2u32}, {3u32}> = A::<'a, u32, {2u32 + 2u32}, {3u32}> { data: PhantomData };
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `2`, found `4`
|
||||
|
|
||||
= note: expected type `2`
|
||||
found type `4`
|
||||
= note: expected constant `2`
|
||||
found constant `4`
|
||||
|
||||
error[E0308]: mismatched types
|
||||
--> $DIR/types-mismatch-const-args.rs:16:41
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue