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.rs | |
| parent | 49562d36b97ddde34cf7585a8c2e8f232519b657 (diff) | |
| parent | d067afb064a7fa67b172abf561b7d80740cd6f18 (diff) | |
Merge branch 'master' into feature/themes
Diffstat (limited to 'crates/ra_hir/src/ty.rs')
| -rw-r--r-- | crates/ra_hir/src/ty.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs index cc9746f6d..d2bfcdc7d 100644 --- a/crates/ra_hir/src/ty.rs +++ b/crates/ra_hir/src/ty.rs | |||
| @@ -17,8 +17,8 @@ use std::sync::Arc; | |||
| 17 | use std::{fmt, iter, mem}; | 17 | use std::{fmt, iter, mem}; |
| 18 | 18 | ||
| 19 | use crate::{ | 19 | use crate::{ |
| 20 | db::HirDatabase, expr::ExprId, type_ref::Mutability, util::make_mut_slice, Adt, Crate, | 20 | db::HirDatabase, expr::ExprId, util::make_mut_slice, Adt, Crate, DefWithBody, GenericParams, |
| 21 | DefWithBody, GenericParams, HasGenericParams, Name, Trait, TypeAlias, | 21 | HasGenericParams, Mutability, Name, Trait, TypeAlias, |
| 22 | }; | 22 | }; |
| 23 | use display::{HirDisplay, HirFormatter}; | 23 | use display::{HirDisplay, HirFormatter}; |
| 24 | 24 | ||