diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-16 12:17:53 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-16 12:17:53 +0100 |
commit | 468982e45a035c271c40bea9b17c2c202a7efc75 (patch) | |
tree | 96f00583eaa8659a21960fa5fc4717d4d9bf0962 /crates/ra_ide/src/inlay_hints.rs | |
parent | 8a880230a522b34a0ba7f434f4ad3acdfd3448b1 (diff) | |
parent | b5ce84b17023d27f4e96ec7911aca712db0e000b (diff) |
Merge #5405
5405: Align CallableDefId naming with other ids r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide/src/inlay_hints.rs')
-rw-r--r-- | crates/ra_ide/src/inlay_hints.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs index 35ab741d8..3cbae8a45 100644 --- a/crates/ra_ide/src/inlay_hints.rs +++ b/crates/ra_ide/src/inlay_hints.rs | |||
@@ -324,13 +324,13 @@ fn get_fn_signature(sema: &Semantics<RootDatabase>, expr: &ast::Expr) -> Option< | |||
324 | // FIXME: Type::as_callable is broken for closures | 324 | // FIXME: Type::as_callable is broken for closures |
325 | let callable_def = sema.type_of_expr(&expr.expr()?)?.as_callable()?; | 325 | let callable_def = sema.type_of_expr(&expr.expr()?)?.as_callable()?; |
326 | match callable_def { | 326 | match callable_def { |
327 | hir::CallableDef::FunctionId(it) => { | 327 | hir::CallableDefId::FunctionId(it) => { |
328 | Some(FunctionSignature::from_hir(sema.db, it.into())) | 328 | Some(FunctionSignature::from_hir(sema.db, it.into())) |
329 | } | 329 | } |
330 | hir::CallableDef::StructId(it) => { | 330 | hir::CallableDefId::StructId(it) => { |
331 | FunctionSignature::from_struct(sema.db, it.into()) | 331 | FunctionSignature::from_struct(sema.db, it.into()) |
332 | } | 332 | } |
333 | hir::CallableDef::EnumVariantId(it) => { | 333 | hir::CallableDefId::EnumVariantId(it) => { |
334 | FunctionSignature::from_enum_variant(sema.db, it.into()) | 334 | FunctionSignature::from_enum_variant(sema.db, it.into()) |
335 | } | 335 | } |
336 | } | 336 | } |