diff options
| author | Mikhail Rakhmanov <[email protected]> | 2020-06-13 07:42:15 +0100 |
|---|---|---|
| committer | Mikhail Rakhmanov <[email protected]> | 2020-06-13 07:42:15 +0100 |
| commit | 16bbf4ab7f132e6e5e5318dccdef9a5d71afdd7f (patch) | |
| tree | 4b79fa8c046be56b02427ba843e70cdf3ac05767 /crates/ra_hir_ty/src/traits/chalk/interner.rs | |
| parent | eeb8b9e236796da8734ba81a49164864497f7226 (diff) | |
| parent | b56ad148db0c69eb279c225f45d324b4e80e7367 (diff) | |
Merge branch 'master' into keyword_completion
# Conflicts:
# docs/user/generated_features.adoc
Diffstat (limited to 'crates/ra_hir_ty/src/traits/chalk/interner.rs')
| -rw-r--r-- | crates/ra_hir_ty/src/traits/chalk/interner.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crates/ra_hir_ty/src/traits/chalk/interner.rs b/crates/ra_hir_ty/src/traits/chalk/interner.rs index e27074ba6..56aab640c 100644 --- a/crates/ra_hir_ty/src/traits/chalk/interner.rs +++ b/crates/ra_hir_ty/src/traits/chalk/interner.rs | |||
| @@ -22,6 +22,8 @@ pub type AssociatedTyValueId = chalk_solve::rust_ir::AssociatedTyValueId<Interne | |||
| 22 | pub type AssociatedTyValue = chalk_solve::rust_ir::AssociatedTyValue<Interner>; | 22 | pub type AssociatedTyValue = chalk_solve::rust_ir::AssociatedTyValue<Interner>; |
| 23 | pub type FnDefId = chalk_ir::FnDefId<Interner>; | 23 | pub type FnDefId = chalk_ir::FnDefId<Interner>; |
| 24 | pub type FnDefDatum = chalk_solve::rust_ir::FnDefDatum<Interner>; | 24 | pub type FnDefDatum = chalk_solve::rust_ir::FnDefDatum<Interner>; |
| 25 | pub type OpaqueTyId = chalk_ir::OpaqueTyId<Interner>; | ||
| 26 | pub type OpaqueTyDatum = chalk_solve::rust_ir::OpaqueTyDatum<Interner>; | ||
| 25 | 27 | ||
| 26 | impl chalk_ir::interner::Interner for Interner { | 28 | impl chalk_ir::interner::Interner for Interner { |
| 27 | type InternedType = Box<chalk_ir::TyData<Self>>; // FIXME use Arc? | 29 | type InternedType = Box<chalk_ir::TyData<Self>>; // FIXME use Arc? |