diff options
| author | Seivan Heidari <[email protected]> | 2019-10-31 08:43:20 +0000 |
|---|---|---|
| committer | Seivan Heidari <[email protected]> | 2019-10-31 08:43:20 +0000 |
| commit | 8edda0e7b164009d6c03bb3d4be603fb38ad2e2a (patch) | |
| tree | 744cf81075d394e2f9c06afb07642a2601800dda /crates/ra_hir/src/ty/infer/coerce.rs | |
| parent | 49562d36b97ddde34cf7585a8c2e8f232519b657 (diff) | |
| parent | d067afb064a7fa67b172abf561b7d80740cd6f18 (diff) | |
Merge branch 'master' into feature/themes
Diffstat (limited to 'crates/ra_hir/src/ty/infer/coerce.rs')
| -rw-r--r-- | crates/ra_hir/src/ty/infer/coerce.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crates/ra_hir/src/ty/infer/coerce.rs b/crates/ra_hir/src/ty/infer/coerce.rs index 0429a9866..6ea135126 100644 --- a/crates/ra_hir/src/ty/infer/coerce.rs +++ b/crates/ra_hir/src/ty/infer/coerce.rs | |||
| @@ -14,8 +14,7 @@ use crate::{ | |||
| 14 | lang_item::LangItemTarget, | 14 | lang_item::LangItemTarget, |
| 15 | resolve::Resolver, | 15 | resolve::Resolver, |
| 16 | ty::{autoderef, Substs, Ty, TypeCtor, TypeWalk}, | 16 | ty::{autoderef, Substs, Ty, TypeCtor, TypeWalk}, |
| 17 | type_ref::Mutability, | 17 | Adt, Mutability, |
| 18 | Adt, | ||
| 19 | }; | 18 | }; |
| 20 | 19 | ||
| 21 | impl<'a, D: HirDatabase> InferenceContext<'a, D> { | 20 | impl<'a, D: HirDatabase> InferenceContext<'a, D> { |