diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 16:06:52 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 16:06:52 +0000 |
| commit | 72a4951023f11adfdf0eac353c99d8a01a9471fc (patch) | |
| tree | 8cca098650d989ea58e6bd4aafd44e5ff85fcee5 /crates/ra_ide_api/src/hover.rs | |
| parent | 7c977a7dcd2bac3b6148f2428bcb586c6354d775 (diff) | |
| parent | 18e9a710cd2f2ced84fde19e88d0b967dcb5939e (diff) | |
Merge #553
553: remove Cancelable from fn_scopes r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide_api/src/hover.rs')
| -rw-r--r-- | crates/ra_ide_api/src/hover.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_ide_api/src/hover.rs b/crates/ra_ide_api/src/hover.rs index 26f3ced70..0e9c48421 100644 --- a/crates/ra_ide_api/src/hover.rs +++ b/crates/ra_ide_api/src/hover.rs | |||
| @@ -74,7 +74,7 @@ pub(crate) fn type_of(db: &RootDatabase, frange: FileRange) -> Cancelable<Option | |||
| 74 | parent_fn | 74 | parent_fn |
| 75 | )); | 75 | )); |
| 76 | let infer = function.infer(db)?; | 76 | let infer = function.infer(db)?; |
| 77 | let syntax_mapping = function.body_syntax_mapping(db)?; | 77 | let syntax_mapping = function.body_syntax_mapping(db); |
| 78 | if let Some(expr) = ast::Expr::cast(node).and_then(|e| syntax_mapping.node_expr(e)) { | 78 | if let Some(expr) = ast::Expr::cast(node).and_then(|e| syntax_mapping.node_expr(e)) { |
| 79 | Ok(Some(infer[expr].to_string())) | 79 | Ok(Some(infer[expr].to_string())) |
| 80 | } else if let Some(pat) = ast::Pat::cast(node).and_then(|p| syntax_mapping.node_pat(p)) { | 80 | } else if let Some(pat) = ast::Pat::cast(node).and_then(|p| syntax_mapping.node_pat(p)) { |