diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-04-05 14:05:35 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-04-05 14:05:35 +0100 |
commit | 8a18f23df068dd8e3cfaea15391610dbda418aab (patch) | |
tree | b2520aac7015ecc4062720ce88be5c19f16a0177 /crates/hir_ty/src/types.rs | |
parent | c2be91dcd826e1529ac6ac431b3f871ec72abebc (diff) | |
parent | 72c54c53cdc543eab40fc5d4593e6a7f57c94755 (diff) |
Merge #8342
8342: Rename `TyKind::Unknown` and `TyKind::ForeignType` (Chalk move) r=flodiebold a=lnicola
CC #8313
Co-authored-by: Laurențiu Nicola <[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 53662fcdc..bac086318 100644 --- a/crates/hir_ty/src/types.rs +++ b/crates/hir_ty/src/types.rs | |||
@@ -132,7 +132,7 @@ pub enum TyKind { | |||
132 | Closure(ClosureId, Substitution), | 132 | Closure(ClosureId, Substitution), |
133 | 133 | ||
134 | /// Represents a foreign type declared in external blocks. | 134 | /// Represents a foreign type declared in external blocks. |
135 | ForeignType(ForeignDefId), | 135 | Foreign(ForeignDefId), |
136 | 136 | ||
137 | /// A pointer to a function. Written as `fn() -> i32`. | 137 | /// A pointer to a function. Written as `fn() -> i32`. |
138 | /// | 138 | /// |
@@ -179,7 +179,7 @@ pub enum TyKind { | |||
179 | /// variables are inserted before type checking, since we want to try to | 179 | /// variables are inserted before type checking, since we want to try to |
180 | /// infer a better type here anyway -- for the IDE use case, we want to try | 180 | /// infer a better type here anyway -- for the IDE use case, we want to try |
181 | /// to infer as much as possible even in the presence of type errors. | 181 | /// to infer as much as possible even in the presence of type errors. |
182 | Unknown, | 182 | Error, |
183 | } | 183 | } |
184 | 184 | ||
185 | #[derive(Clone, PartialEq, Eq, Debug, Hash)] | 185 | #[derive(Clone, PartialEq, Eq, Debug, Hash)] |