diff options
| author | Aleksey Kladov <[email protected]> | 2020-03-06 13:44:44 +0000 |
|---|---|---|
| committer | Aleksey Kladov <[email protected]> | 2020-03-06 13:44:44 +0000 |
| commit | fb5891c4330e577f5d6891be529141695ce36d4f (patch) | |
| tree | 6c7f1384e77c29b9bdc3080acfbaadb1bcb01f0f /crates/ra_hir_ty/src/expr.rs | |
| parent | ea0c124219da33462b9d0be93f7abe0478cc7af2 (diff) | |
Source map returns a result
cc #2236
Diffstat (limited to 'crates/ra_hir_ty/src/expr.rs')
| -rw-r--r-- | crates/ra_hir_ty/src/expr.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir_ty/src/expr.rs b/crates/ra_hir_ty/src/expr.rs index 22f24890d..d8cdf5266 100644 --- a/crates/ra_hir_ty/src/expr.rs +++ b/crates/ra_hir_ty/src/expr.rs | |||
| @@ -100,7 +100,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> { | |||
| 100 | } | 100 | } |
| 101 | let (_, source_map) = db.body_with_source_map(self.func.into()); | 101 | let (_, source_map) = db.body_with_source_map(self.func.into()); |
| 102 | 102 | ||
| 103 | if let Some(source_ptr) = source_map.expr_syntax(id) { | 103 | if let Ok(source_ptr) = source_map.expr_syntax(id) { |
| 104 | if let Some(expr) = source_ptr.value.left() { | 104 | if let Some(expr) = source_ptr.value.left() { |
| 105 | let root = source_ptr.file_syntax(db); | 105 | let root = source_ptr.file_syntax(db); |
| 106 | if let ast::Expr::RecordLit(record_lit) = expr.to_node(&root) { | 106 | if let ast::Expr::RecordLit(record_lit) = expr.to_node(&root) { |
| @@ -145,7 +145,7 @@ impl<'a, 'b> ExprValidator<'a, 'b> { | |||
| 145 | if params.len() == 2 && params[0] == mismatch.actual { | 145 | if params.len() == 2 && params[0] == mismatch.actual { |
| 146 | let (_, source_map) = db.body_with_source_map(self.func.into()); | 146 | let (_, source_map) = db.body_with_source_map(self.func.into()); |
| 147 | 147 | ||
| 148 | if let Some(source_ptr) = source_map.expr_syntax(id) { | 148 | if let Ok(source_ptr) = source_map.expr_syntax(id) { |
| 149 | if let Some(expr) = source_ptr.value.left() { | 149 | if let Some(expr) = source_ptr.value.left() { |
| 150 | self.sink.push(MissingOkInTailExpr { file: source_ptr.file_id, expr }); | 150 | self.sink.push(MissingOkInTailExpr { file: source_ptr.file_id, expr }); |
| 151 | } | 151 | } |