diff options
Diffstat (limited to 'crates/ra_hir/src')
-rw-r--r-- | crates/ra_hir/src/code_model.rs | 4 | ||||
-rw-r--r-- | crates/ra_hir/src/lib.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index 42c9ca189..9891b0785 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs | |||
@@ -40,7 +40,7 @@ use stdx::impl_from; | |||
40 | use crate::{ | 40 | use crate::{ |
41 | db::{DefDatabase, HirDatabase}, | 41 | db::{DefDatabase, HirDatabase}, |
42 | has_source::HasSource, | 42 | has_source::HasSource, |
43 | CallableDef, HirDisplay, InFile, Name, | 43 | CallableDefId, HirDisplay, InFile, Name, |
44 | }; | 44 | }; |
45 | 45 | ||
46 | /// hir::Crate describes a single crate. It's the main interface with which | 46 | /// hir::Crate describes a single crate. It's the main interface with which |
@@ -1226,7 +1226,7 @@ impl Type { | |||
1226 | } | 1226 | } |
1227 | 1227 | ||
1228 | // FIXME: this method is broken, as it doesn't take closures into account. | 1228 | // FIXME: this method is broken, as it doesn't take closures into account. |
1229 | pub fn as_callable(&self) -> Option<CallableDef> { | 1229 | pub fn as_callable(&self) -> Option<CallableDefId> { |
1230 | Some(self.ty.value.as_callable()?.0) | 1230 | Some(self.ty.value.as_callable()?.0) |
1231 | } | 1231 | } |
1232 | 1232 | ||
diff --git a/crates/ra_hir/src/lib.rs b/crates/ra_hir/src/lib.rs index 7d9b174b4..cf7134923 100644 --- a/crates/ra_hir/src/lib.rs +++ b/crates/ra_hir/src/lib.rs | |||
@@ -55,4 +55,4 @@ pub use hir_expand::{ | |||
55 | hygiene::Hygiene, name::Name, HirFileId, InFile, MacroCallId, MacroCallLoc, MacroDefId, | 55 | hygiene::Hygiene, name::Name, HirFileId, InFile, MacroCallId, MacroCallLoc, MacroDefId, |
56 | MacroFile, Origin, | 56 | MacroFile, Origin, |
57 | }; | 57 | }; |
58 | pub use hir_ty::{display::HirDisplay, CallableDef}; | 58 | pub use hir_ty::{display::HirDisplay, CallableDefId}; |