diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-04-06 12:34:34 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-04-06 12:34:34 +0100 |
commit | 002e72a28de3df818992442ad49bb60d3d0b1d0b (patch) | |
tree | 266da1eafcd60457fa99cc422a415e27992c08d7 /crates/hir_ty/src/types.rs | |
parent | 047b5313013383fc4fafaef6d6d8d6a64549e3cb (diff) | |
parent | 9fbba7bc45ec6bea9468931d9d9fdd0141826f0a (diff) |
Merge #8366
8366: Add chalk_ir::Const to TyKind::Array r=flodiebold a=Veykril
CC #8313
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/hir_ty/src/types.rs')
-rw-r--r-- | crates/hir_ty/src/types.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir_ty/src/types.rs b/crates/hir_ty/src/types.rs index 844e57896..89c0ddd1a 100644 --- a/crates/hir_ty/src/types.rs +++ b/crates/hir_ty/src/types.rs | |||
@@ -10,7 +10,7 @@ use chalk_ir::{ | |||
10 | use smallvec::SmallVec; | 10 | use smallvec::SmallVec; |
11 | 11 | ||
12 | use crate::{ | 12 | use crate::{ |
13 | AssocTypeId, CanonicalVarKinds, ChalkTraitId, ClosureId, FnDefId, FnSig, ForeignDefId, | 13 | AssocTypeId, CanonicalVarKinds, ChalkTraitId, ClosureId, Const, FnDefId, FnSig, ForeignDefId, |
14 | InferenceVar, Interner, Lifetime, OpaqueTyId, PlaceholderIndex, TypeWalk, VariableKind, | 14 | InferenceVar, Interner, Lifetime, OpaqueTyId, PlaceholderIndex, TypeWalk, VariableKind, |
15 | VariableKinds, | 15 | VariableKinds, |
16 | }; | 16 | }; |
@@ -114,7 +114,7 @@ pub enum TyKind { | |||
114 | Tuple(usize, Substitution), | 114 | Tuple(usize, Substitution), |
115 | 115 | ||
116 | /// An array with the given length. Written as `[T; n]`. | 116 | /// An array with the given length. Written as `[T; n]`. |
117 | Array(Ty), | 117 | Array(Ty, Const), |
118 | 118 | ||
119 | /// The pointee of an array slice. Written as `[T]`. | 119 | /// The pointee of an array slice. Written as `[T]`. |
120 | Slice(Ty), | 120 | Slice(Ty), |