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/traits/chalk.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/traits/chalk.rs')
-rw-r--r-- | crates/hir_ty/src/traits/chalk.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir_ty/src/traits/chalk.rs b/crates/hir_ty/src/traits/chalk.rs index 541e6082f..b7388b98c 100644 --- a/crates/hir_ty/src/traits/chalk.rs +++ b/crates/hir_ty/src/traits/chalk.rs | |||
@@ -265,7 +265,7 @@ impl<'a> chalk_solve::RustIrDatabase<Interner> for ChalkContext<'a> { | |||
265 | 265 | ||
266 | fn hidden_opaque_type(&self, _id: chalk_ir::OpaqueTyId<Interner>) -> chalk_ir::Ty<Interner> { | 266 | fn hidden_opaque_type(&self, _id: chalk_ir::OpaqueTyId<Interner>) -> chalk_ir::Ty<Interner> { |
267 | // FIXME: actually provide the hidden type; it is relevant for auto traits | 267 | // FIXME: actually provide the hidden type; it is relevant for auto traits |
268 | TyKind::Unknown.intern(&Interner).to_chalk(self.db) | 268 | TyKind::Error.intern(&Interner).to_chalk(self.db) |
269 | } | 269 | } |
270 | 270 | ||
271 | fn is_object_safe(&self, _trait_id: chalk_ir::TraitId<Interner>) -> bool { | 271 | fn is_object_safe(&self, _trait_id: chalk_ir::TraitId<Interner>) -> bool { |